Completed
Push — master ( 1af268...5f21ae )
by Aimeos
04:55
created
controller/frontend/tests/Controller/Frontend/FactoryTest.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -14,92 +14,92 @@
 block discarded – undo
14 14
 {
15 15
 	public function testCreateController()
16 16
 	{
17
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket' );
18
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
17
+		$controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket');
18
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
19 19
 	}
20 20
 
21 21
 
22 22
 	public function testCreateControllerEmpty()
23 23
 	{
24
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
25
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '' );
24
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
25
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '');
26 26
 	}
27 27
 
28 28
 
29 29
 	public function testCreateControllerInvalidName()
30 30
 	{
31
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
32
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
31
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
32
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '%^');
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testCreateControllerNotExisting()
37 37
 	{
38
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
39
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
38
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
39
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
40 40
 	}
41 41
 
42 42
 
43 43
 	public function testCreateSubControllerNotExisting()
44 44
 	{
45
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
46
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket/notexist' );
45
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
46
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket/notexist');
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testClear()
51 51
 	{
52
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
52
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
53 53
 
54 54
 		$context = \TestHelperFrontend::getContext();
55 55
 
56
-		$controller1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
56
+		$controller1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
57 57
 		\Aimeos\Controller\Frontend\Factory::clear();
58
-		$controller2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
58
+		$controller2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
59 59
 
60
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
60
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
61 61
 
62
-		$this->assertNotSame( $controller1, $controller2 );
62
+		$this->assertNotSame($controller1, $controller2);
63 63
 	}
64 64
 
65 65
 
66 66
 	public function testClearSite()
67 67
 	{
68
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
68
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
69 69
 
70 70
 		$context = \TestHelperFrontend::getContext();
71 71
 
72
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
73
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
74
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context );
72
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
73
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
74
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context);
75 75
 
76
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
77
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
76
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
77
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
78 78
 
79
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
79
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
80 80
 
81
-		$this->assertNotSame( $basket1, $basket2 );
82
-		$this->assertNotSame( $catalog1, $catalog2 );
81
+		$this->assertNotSame($basket1, $basket2);
82
+		$this->assertNotSame($catalog1, $catalog2);
83 83
 	}
84 84
 
85 85
 
86 86
 	public function testClearSpecific()
87 87
 	{
88
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
88
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
89 89
 
90 90
 		$context = \TestHelperFrontend::getContext();
91 91
 
92
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
93
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
94
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' );
92
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
93
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
94
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket');
95 95
 
96
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
97
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
96
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
97
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
98 98
 
99
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
99
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
100 100
 
101
-		$this->assertNotSame( $basket1, $basket2 );
102
-		$this->assertSame( $catalog1, $catalog2 );
101
+		$this->assertNotSame($basket1, $basket2);
102
+		$this->assertSame($catalog1, $catalog2);
103 103
 	}
104 104
 
105 105
 }
106 106
\ No newline at end of file
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Locale/Decorator/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
 	/**
105 105
 	 * Returns the frontend controller
106 106
 	 *
107
-	 * @return \Aimeos\Controller\Frontend\Locale\Iface Frontend controller object
107
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
108 108
 	 */
109 109
 	protected function getController()
110 110
 	{
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 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\Locale\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
 
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
81 81
 	 * @since 2017.03
82 82
 	 */
83
-	public function getItem( $id, array $domains = [] )
83
+	public function getItem($id, array $domains = [])
84 84
 	{
85
-		return $this->controller->getItem( $id, $domains );
85
+		return $this->controller->getItem($id, $domains);
86 86
 	}
87 87
 
88 88
 
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
96 96
 	 * @since 2017.03
97 97
 	 */
98
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
98
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
99 99
 	{
100
-		return $this->controller->searchItems( $filter, $domains, $total );
100
+		return $this->controller->searchItems($filter, $domains, $total);
101 101
 	}
102 102
 
103 103
 
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Locale/FactoryTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,31 +15,31 @@
 block discarded – undo
15 15
 	{
16 16
 		$target = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface';
17 17
 
18
-		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext() );
19
-		$this->assertInstanceOf( $target, $controller );
18
+		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext());
19
+		$this->assertInstanceOf($target, $controller);
20 20
 
21
-		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
22
-		$this->assertInstanceOf( $target, $controller );
21
+		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
22
+		$this->assertInstanceOf($target, $controller);
23 23
 	}
24 24
 
25 25
 
26 26
 	public function testCreateControllerInvalidImplementation()
27 27
 	{
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
29
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
29
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
30 30
 	}
31 31
 
32 32
 
33 33
 	public function testCreateControllerInvalidName()
34 34
 	{
35
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
36
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
35
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
36
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), '%^');
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testCreateControllerNotExisting()
41 41
 	{
42
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
43
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
42
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
43
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Locale/Decorator/BaseTest.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,97 +20,97 @@
 block discarded – undo
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22 22
 
23
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Standard' )
23
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
24 24
 			->disableOriginalConstructor()
25 25
 			->getMock();
26 26
 
27
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
28
-			->setConstructorArgs( [$this->stub, $this->context] )
27
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\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\Locale\Decorator\Base' )
46
-			->setConstructorArgs( [$stub, $this->context] )
45
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\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\Locale\Standard' )
53
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
54 54
 			->disableOriginalConstructor()
55
-			->setMethods( ['invalid'] )
55
+			->setMethods(['invalid'])
56 56
 			->getMock();
57 57
 
58
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
59
-			->setConstructorArgs( [$stub, $this->context] )
58
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\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 testCreateFilter()
69 69
 	{
70
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
70
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
71 71
 
72
-		$this->stub->expects( $this->once() )->method( 'createFilter' )
73
-			->will( $this->returnValue( $search ) );
72
+		$this->stub->expects($this->once())->method('createFilter')
73
+			->will($this->returnValue($search));
74 74
 
75
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
75
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
76 76
 	}
77 77
 
78 78
 
79 79
 	public function testGetItem()
80 80
 	{
81
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createItem();
81
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createItem();
82 82
 
83
-		$this->stub->expects( $this->once() )->method( 'getItem' )
84
-			->will( $this->returnValue( $item ) );
83
+		$this->stub->expects($this->once())->method('getItem')
84
+			->will($this->returnValue($item));
85 85
 
86
-		$this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ) );
86
+		$this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ));
87 87
 	}
88 88
 
89 89
 
90 90
 	public function testSearchItems()
91 91
 	{
92
-		$filter = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
92
+		$filter = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
93 93
 
94
-		$this->stub->expects( $this->once() )->method( 'searchItems' )
95
-			->will( $this->returnValue( [] ) );
94
+		$this->stub->expects($this->once())->method('searchItems')
95
+			->will($this->returnValue([]));
96 96
 
97
-		$this->assertEquals( [], $this->object->searchItems( $filter, ['media'] ) );
97
+		$this->assertEquals([], $this->object->searchItems($filter, ['media']));
98 98
 	}
99 99
 
100 100
 
101 101
 	public function testGetController()
102 102
 	{
103
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
103
+		$result = $this->access('getController')->invokeArgs($this->object, []);
104 104
 
105
-		$this->assertSame( $this->stub, $result );
105
+		$this->assertSame($this->stub, $result);
106 106
 	}
107 107
 
108 108
 
109
-	protected function access( $name )
109
+	protected function access($name)
110 110
 	{
111
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' );
112
-		$method = $class->getMethod( $name );
113
-		$method->setAccessible( true );
111
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Locale\Decorator\Base');
112
+		$method = $class->getMethod($name);
113
+		$method->setAccessible(true);
114 114
 
115 115
 		return $method;
116 116
 	}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Locale/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
29 29
 	 * @return \Aimeos\Controller\Frontend\Locale\Iface Controller object
30 30
 	 */
31
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
31
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
32 32
 	{
33 33
 		/** controller/frontend/locale/name
34 34
 		 * Class name of the used locale frontend controller implementation
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 		 * @since 2014.03
64 64
 		 * @category Developer
65 65
 		 */
66
-		if( $name === null ) {
67
-			$name = $context->getConfig()->get( 'controller/frontend/locale/name', 'Standard' );
66
+		if ($name === null) {
67
+			$name = $context->getConfig()->get('controller/frontend/locale/name', 'Standard');
68 68
 		}
69 69
 
70
-		if( ctype_alnum( $name ) === false )
70
+		if (ctype_alnum($name) === false)
71 71
 		{
72
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>';
73
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
72
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>';
73
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
74 74
 		}
75 75
 
76 76
 		$iface = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface';
77 77
 		$classname = '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name;
78 78
 
79
-		$manager = self::createControllerBase( $context, $classname, $iface );
79
+		$manager = self::createControllerBase($context, $classname, $iface);
80 80
 
81 81
 		/** controller/frontend/locale/decorators/excludes
82 82
 		 * Excludes decorators added by the "common" option from the locale frontend controllers
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * @see controller/frontend/locale/decorators/excludes
153 153
 		 * @see controller/frontend/locale/decorators/global
154 154
 		 */
155
-		return self::addControllerDecorators( $context, $manager, 'locale' );
155
+		return self::addControllerDecorators($context, $manager, 'locale');
156 156
 	}
157 157
 
158 158
 }
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
@@ -311,17 +311,14 @@
 block discarded – undo
311 311
 		{
312 312
 			$address->copyFrom( $value );
313 313
 			$this->get()->setAddress( $address, $type );
314
-		}
315
-		else if( is_array( $value ) )
314
+		} else if( is_array( $value ) )
316 315
 		{
317 316
 			$this->setAddressFromArray( $address, $value );
318 317
 			$this->get()->setAddress( $address, $type );
319
-		}
320
-		else if( $value === null )
318
+		} else if( $value === null )
321 319
 		{
322 320
 			$this->get()->deleteAddress( $type );
323
-		}
324
-		else
321
+		} else
325 322
 		{
326 323
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
327 324
 		}
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
 	 * Sets 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   +131 added lines, -131 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,28 +145,28 @@  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 ) {
161
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary order limit reached' ) );
160
+		if ($total > $count) {
161
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary order limit reached'));
162 162
 		}
163 163
 
164 164
 
165 165
 		$basket = $this->get()->finish();
166
-		$basket->setCustomerId( (string) $context->getUserId() );
166
+		$basket->setCustomerId((string) $context->getUserId());
167 167
 
168 168
 		$this->domainManager->begin();
169
-		$this->domainManager->store( $basket );
169
+		$this->domainManager->store($basket);
170 170
 		$this->domainManager->commit();
171 171
 
172 172
 		return $basket;
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
181 181
 	 * @param boolean $default True to add default criteria (user logged in), false if not
182 182
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
183 183
 	 */
184
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
184
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
185 185
 	{
186
-		return $this->domainManager->load( $id, $parts, false, $default );
186
+		return $this->domainManager->load($id, $parts, false, $default);
187 187
 	}
188 188
 
189 189
 
@@ -203,34 +203,34 @@  discard block
 block discarded – undo
203 203
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
204 204
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
205 205
 	 */
206
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
206
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
207 207
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
208
-		$stocktype = 'default' )
208
+		$stocktype = 'default')
209 209
 	{
210 210
 		$attributeMap = [
211
-			'custom' => array_keys( $customAttributeValues ),
211
+			'custom' => array_keys($customAttributeValues),
212 212
 			'config' => $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', $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', $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 = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
250
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
249
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
250
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
251 251
 		}
252 252
 
253
-		$this->get()->deleteProduct( $position );
253
+		$this->get()->deleteProduct($position);
254 254
 		$this->save();
255 255
 	}
256 256
 
@@ -264,33 +264,33 @@  discard block
 block discarded – undo
264 264
 	 * 	The 'stock'=>false option allows adding products without being in stock.
265 265
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
266 266
 	 */
267
-	public function editProduct( $position, $quantity, array $options = [],
268
-		array $configAttributeCodes = [] )
267
+	public function editProduct($position, $quantity, array $options = [],
268
+		array $configAttributeCodes = [])
269 269
 	{
270
-		$product = $this->get()->getProduct( $position );
270
+		$product = $this->get()->getProduct($position);
271 271
 
272
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
272
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
273 273
 		{
274
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
275
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
274
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
275
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
276 276
 		}
277 277
 
278
-		$product->setQuantity( $quantity );
278
+		$product->setQuantity($quantity);
279 279
 
280 280
 		$attributes = $product->getAttributes();
281
-		foreach( $attributes as $key => $attribute )
281
+		foreach ($attributes as $key => $attribute)
282 282
 		{
283
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
284
-				unset( $attributes[$key] );
283
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
284
+				unset($attributes[$key]);
285 285
 			}
286 286
 		}
287
-		$product->setAttributes( $attributes );
287
+		$product->setAttributes($attributes);
288 288
 
289
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
290
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ) );
291
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
289
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
290
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'));
291
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
292 292
 
293
-		$this->get()->editProduct( $product, $position );
293
+		$this->get()->editProduct($product, $position);
294 294
 
295 295
 		$this->save();
296 296
 	}
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 	 * @param string $code Coupon code entered by the user
303 303
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
304 304
 	 */
305
-	public function addCoupon( $code )
305
+	public function addCoupon($code)
306 306
 	{
307 307
 		$context = $this->getContext();
308 308
 
@@ -322,55 +322,55 @@  discard block
 block discarded – undo
322 322
 		 * @category User
323 323
 		 * @category Developer
324 324
 		 */
325
-		$allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 ); // @deprecated
326
-		$allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', $allowed );
325
+		$allowed = $context->getConfig()->get('client/html/basket/standard/coupon/allowed', 1); // @deprecated
326
+		$allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', $allowed);
327 327
 
328
-		if( $allowed <= count( $this->get()->getCoupons() ) ) {
329
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
328
+		if ($allowed <= count($this->get()->getCoupons())) {
329
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Number of coupon codes exceeds the limit'));
330 330
 		}
331 331
 
332 332
 
333
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
334
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
333
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
334
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
335 335
 
336 336
 
337
-		$search = $codeManager->createSearch( true );
337
+		$search = $codeManager->createSearch(true);
338 338
 		$expr = array(
339
-			$search->compare( '==', 'coupon.code.code', $code ),
339
+			$search->compare('==', 'coupon.code.code', $code),
340 340
 			$search->getConditions(),
341 341
 		);
342
-		$search->setConditions( $search->combine( '&&', $expr ) );
343
-		$search->setSlice( 0, 1 );
342
+		$search->setConditions($search->combine('&&', $expr));
343
+		$search->setSlice(0, 1);
344 344
 
345
-		$result = $codeManager->searchItems( $search );
345
+		$result = $codeManager->searchItems($search);
346 346
 
347
-		if( ( $codeItem = reset( $result ) ) === false ) {
348
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
347
+		if (($codeItem = reset($result)) === false) {
348
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
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 ) {
363
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
362
+		if (($item = reset($result)) === false) {
363
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
364 364
 		}
365 365
 
366 366
 
367
-		$provider = $manager->getProvider( $item, $codeItem->getCode() );
367
+		$provider = $manager->getProvider($item, $codeItem->getCode());
368 368
 
369
-		if( $provider->isAvailable( $this->get() ) !== true ) {
370
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
369
+		if ($provider->isAvailable($this->get()) !== true) {
370
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
371 371
 		}
372 372
 
373
-		$provider->addCoupon( $this->get() );
373
+		$provider->addCoupon($this->get());
374 374
 		$this->save();
375 375
 	}
376 376
 
@@ -381,21 +381,21 @@  discard block
 block discarded – undo
381 381
 	 * @param string $code Coupon code entered by the user
382 382
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
383 383
 	 */
384
-	public function deleteCoupon( $code )
384
+	public function deleteCoupon($code)
385 385
 	{
386
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
386
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
387 387
 
388 388
 		$search = $manager->createSearch();
389
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
390
-		$search->setSlice( 0, 1 );
389
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
390
+		$search->setSlice(0, 1);
391 391
 
392
-		$result = $manager->searchItems( $search );
392
+		$result = $manager->searchItems($search);
393 393
 
394
-		if( ( $item = reset( $result ) ) === false ) {
395
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
394
+		if (($item = reset($result)) === false) {
395
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
396 396
 		}
397 397
 
398
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
398
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
399 399
 		$this->save();
400 400
 	}
401 401
 
@@ -408,28 +408,28 @@  discard block
 block discarded – undo
408 408
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
409 409
 	 * 	if one of the keys is invalid when using an array with key/value pairs
410 410
 	 */
411
-	public function setAddress( $type, $value )
411
+	public function setAddress($type, $value)
412 412
 	{
413
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
414
-		$address->setType( $type );
413
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
414
+		$address->setType($type);
415 415
 
416
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
416
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
417 417
 		{
418
-			$address->copyFrom( $value );
419
-			$this->get()->setAddress( $address, $type );
418
+			$address->copyFrom($value);
419
+			$this->get()->setAddress($address, $type);
420 420
 		}
421
-		else if( is_array( $value ) )
421
+		else if (is_array($value))
422 422
 		{
423
-			$this->setAddressFromArray( $address, $value );
424
-			$this->get()->setAddress( $address, $type );
423
+			$this->setAddressFromArray($address, $value);
424
+			$this->get()->setAddress($address, $type);
425 425
 		}
426
-		else if( $value === null )
426
+		else if ($value === null)
427 427
 		{
428
-			$this->get()->deleteAddress( $type );
428
+			$this->get()->deleteAddress($type);
429 429
 		}
430 430
 		else
431 431
 		{
432
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
432
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
433 433
 		}
434 434
 
435 435
 		$this->save();
@@ -445,48 +445,48 @@  discard block
 block discarded – undo
445 445
 	 * 	entered by the customer when choosing one of the delivery or payment options
446 446
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
447 447
 	 */
448
-	public function setService( $type, $id, array $attributes = [] )
448
+	public function setService($type, $id, array $attributes = [])
449 449
 	{
450
-		if( $id === null )
450
+		if ($id === null)
451 451
 		{
452
-			$this->get()->deleteService( $type );
452
+			$this->get()->deleteService($type);
453 453
 			$this->save();
454 454
 			return;
455 455
 		}
456 456
 
457 457
 		$context = $this->getContext();
458 458
 
459
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
460
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
459
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
460
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
461 461
 
462
-		$provider = $serviceManager->getProvider( $serviceItem );
463
-		$result = $provider->checkConfigFE( $attributes );
464
-		$unknown = array_diff_key( $attributes, $result );
462
+		$provider = $serviceManager->getProvider($serviceItem);
463
+		$result = $provider->checkConfigFE($attributes);
464
+		$unknown = array_diff_key($attributes, $result);
465 465
 
466
-		if( count( $unknown ) > 0 )
466
+		if (count($unknown) > 0)
467 467
 		{
468
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
469
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
468
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
469
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
470 470
 		}
471 471
 
472
-		foreach( $result as $key => $value )
472
+		foreach ($result as $key => $value)
473 473
 		{
474
-			if( $value !== null ) {
475
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
474
+			if ($value !== null) {
475
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
476 476
 			}
477 477
 		}
478 478
 
479
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
479
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
480 480
 		$orderServiceItem = $orderBaseServiceManager->createItem();
481
-		$orderServiceItem->copyFrom( $serviceItem );
481
+		$orderServiceItem->copyFrom($serviceItem);
482 482
 
483 483
 		// remove service rebate of original price
484
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
485
-		$orderServiceItem->setPrice( $price );
484
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
485
+		$orderServiceItem->setPrice($price);
486 486
 
487
-		$provider->setConfigFE( $orderServiceItem, $attributes );
487
+		$provider->setConfigFE($orderServiceItem, $attributes);
488 488
 
489
-		$this->get()->setService( $orderServiceItem, $type );
489
+		$this->get()->setService($orderServiceItem, $type);
490 490
 		$this->save();
491 491
 	}
492 492
 
@@ -499,18 +499,18 @@  discard block
 block discarded – undo
499 499
 	 * 	an address item.
500 500
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
501 501
 	 */
502
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
502
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
503 503
 	{
504
-		foreach( $map as $key => $value ) {
505
-			$map[$key] = strip_tags( $value ); // prevent XSS
504
+		foreach ($map as $key => $value) {
505
+			$map[$key] = strip_tags($value); // prevent XSS
506 506
 		}
507 507
 
508
-		$errors = $address->fromArray( $map );
508
+		$errors = $address->fromArray($map);
509 509
 
510
-		if( count( $errors ) > 0 )
510
+		if (count($errors) > 0)
511 511
 		{
512
-			$msg = sprintf( 'Invalid address properties, please check your input' );
513
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
512
+			$msg = sprintf('Invalid address properties, please check your input');
513
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
514 514
 		}
515 515
 	}
516 516
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Base.php 2 patches
Doc Comments   +2 added lines, -2 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
 	{
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	/**
248 248
 	 * Returns the frontend controller
249 249
 	 *
250
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
250
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
251 251
 	 */
252 252
 	protected function getController()
253 253
 	{
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 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\Manager\Base\Base::PARTS_ALL, $default = true )
126
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\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,9 +150,9 @@  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, array $options = [], array $variantAttributeIds = [],
153
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
154 154
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
155
-		$stocktype = 'default' )
155
+		$stocktype = 'default')
156 156
 	{
157 157
 		$this->controller->addProduct(
158 158
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -167,9 +167,9 @@  discard block
 block discarded – undo
167 167
 	 * @param integer $position Position number (key) of the order product item
168 168
 	 * @return void
169 169
 	 */
170
-	public function deleteProduct( $position )
170
+	public function deleteProduct($position)
171 171
 	{
172
-		$this->controller->deleteProduct( $position );
172
+		$this->controller->deleteProduct($position);
173 173
 	}
174 174
 
175 175
 
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
183 183
 	 * @return void
184 184
 	 */
185
-	public function editProduct( $position, $quantity, array $options = [], array $configAttributeCodes = [] )
185
+	public function editProduct($position, $quantity, array $options = [], array $configAttributeCodes = [])
186 186
 	{
187
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
187
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
188 188
 	}
189 189
 
190 190
 
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
196 196
 	 * @return void
197 197
 	 */
198
-	public function addCoupon( $code )
198
+	public function addCoupon($code)
199 199
 	{
200
-		$this->controller->addCoupon( $code );
200
+		$this->controller->addCoupon($code);
201 201
 	}
202 202
 
203 203
 
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
209 209
 	 * @return void
210 210
 	 */
211
-	public function deleteCoupon( $code )
211
+	public function deleteCoupon($code)
212 212
 	{
213
-		$this->controller->deleteCoupon( $code );
213
+		$this->controller->deleteCoupon($code);
214 214
 	}
215 215
 
216 216
 
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
 	 * 	if one of the keys is invalid when using an array with key/value pairs
224 224
 	 * @return void
225 225
 	 */
226
-	public function setAddress( $type, $value )
226
+	public function setAddress($type, $value)
227 227
 	{
228
-		$this->controller->setAddress( $type, $value );
228
+		$this->controller->setAddress($type, $value);
229 229
 	}
230 230
 
231 231
 
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
240 240
 	 * @return void
241 241
 	 */
242
-	public function setService( $type, $id, array $attributes = [] )
242
+	public function setService($type, $id, array $attributes = [])
243 243
 	{
244
-		$this->controller->setService( $type, $id, $attributes );
244
+		$this->controller->setService($type, $id, $attributes);
245 245
 	}
246 246
 
247 247
 
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Basket/Decorator/BaseTest.php 1 patch
Spacing   +43 added lines, -43 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,65 +127,65 @@  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 testSetService()
169 169
 	{
170
-		$this->stub->expects( $this->once() )->method( 'setService' );
170
+		$this->stub->expects($this->once())->method('setService');
171 171
 
172
-		$this->object->setService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
172
+		$this->object->setService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
173 173
 	}
174 174
 
175 175
 
176 176
 	public function testGetController()
177 177
 	{
178
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
178
+		$result = $this->access('getController')->invokeArgs($this->object, []);
179 179
 
180
-		$this->assertSame( $this->stub, $result );
180
+		$this->assertSame($this->stub, $result);
181 181
 	}
182 182
 
183 183
 
184
-	protected function access( $name )
184
+	protected function access($name)
185 185
 	{
186
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' );
187
-		$method = $class->getMethod( $name );
188
-		$method->setAccessible( true );
186
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
187
+		$method = $class->getMethod($name);
188
+		$method->setAccessible(true);
189 189
 
190 190
 		return $method;
191 191
 	}
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Basket/BaseTest.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -276,6 +276,9 @@
 block discarded – undo
276 276
 	}
277 277
 
278 278
 
279
+	/**
280
+	 * @param string $name
281
+	 */
279 282
 	protected function access( $name )
280 283
 	{
281 284
 		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' );
Please login to merge, or discard this patch.
Spacing   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -21,46 +21,46 @@  discard block
 block discarded – undo
21 21
 
22 22
 	protected function tearDown()
23 23
 	{
24
-		$this->context->getSession()->set( 'aimeos', [] );
24
+		$this->context->getSession()->set('aimeos', []);
25 25
 
26
-		unset( $this->context );
26
+		unset($this->context);
27 27
 	}
28 28
 
29 29
 
30 30
 	public function testCheckLocale()
31 31
 	{
32
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
33
-			->setConstructorArgs( [$this->context] )
34
-			->setMethods( null )
32
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
33
+			->setConstructorArgs([$this->context])
34
+			->setMethods(null)
35 35
 			->getMock();
36 36
 
37
-		$this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' );
38
-		$this->access( 'checkLocale' )->invokeArgs( $object, ['unittest'] );
37
+		$this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR');
38
+		$this->access('checkLocale')->invokeArgs($object, ['unittest']);
39 39
 	}
40 40
 
41 41
 
42 42
 	public function testCopyAddresses()
43 43
 	{
44
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
44
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
45 45
 		$ordBaseItem = $manager->createItem();
46 46
 
47
-		$address = $this->getAddress( 'Example company' );
48
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
47
+		$address = $this->getAddress('Example company');
48
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
49 49
 
50 50
 
51
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
52
-			->setConstructorArgs( [$this->context] )
53
-			->setMethods( null )
51
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
52
+			->setConstructorArgs([$this->context])
53
+			->setMethods(null)
54 54
 			->getMock();
55 55
 
56
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
56
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
57 57
 
58 58
 
59
-		$this->assertEquals( ['test'], $result );
60
-		$this->assertEquals( 1, count( $object->get()->getAddresses() ) );
59
+		$this->assertEquals(['test'], $result);
60
+		$this->assertEquals(1, count($object->get()->getAddresses()));
61 61
 
62
-		$addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
63
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr );
62
+		$addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
63
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr);
64 64
 
65 65
 		$object->clear();
66 66
 	}
@@ -68,54 +68,54 @@  discard block
 block discarded – undo
68 68
 
69 69
 	public function testCopyAddressesException()
70 70
 	{
71
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
71
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
72 72
 		$ordBaseItem = $manager->createItem();
73 73
 
74
-		$address = $this->getAddress( 'Example company' );
75
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
74
+		$address = $this->getAddress('Example company');
75
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
76 76
 
77 77
 
78
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
79
-			->setConstructorArgs( [$this->context] )
80
-			->setMethods( ['setAddress'] )
78
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
79
+			->setConstructorArgs([$this->context])
80
+			->setMethods(['setAddress'])
81 81
 			->getMock();
82 82
 
83
-		$object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) );
83
+		$object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception()));
84 84
 
85
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
85
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
86 86
 
87
-		$this->assertEquals( 1, count( $result ) );
88
-		$this->assertArrayHasKey( 'address', $result );
87
+		$this->assertEquals(1, count($result));
88
+		$this->assertArrayHasKey('address', $result);
89 89
 	}
90 90
 
91 91
 
92 92
 	public function testCopyCoupon()
93 93
 	{
94
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
94
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
95 95
 		$ordBaseItem = $manager->createItem();
96 96
 
97
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC', ['price'] );
98
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
99
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
97
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC', ['price']);
98
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
99
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
100 100
 
101
-		$priceItems = $product->getRefItems( 'price' );
102
-		$ordProdItem->setPrice( reset( $priceItems ) );
101
+		$priceItems = $product->getRefItems('price');
102
+		$ordProdItem->setPrice(reset($priceItems));
103 103
 
104
-		$ordBaseItem->addProduct( $ordProdItem );
105
-		$ordBaseItem->addCoupon( 'OPQR', [] );
104
+		$ordBaseItem->addProduct($ordProdItem);
105
+		$ordBaseItem->addCoupon('OPQR', []);
106 106
 
107 107
 
108
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
109
-			->setConstructorArgs( [$this->context] )
110
-			->setMethods( null )
108
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
109
+			->setConstructorArgs([$this->context])
110
+			->setMethods(null)
111 111
 			->getMock();
112 112
 
113
-		$object->addProduct( $product->getId() );
113
+		$object->addProduct($product->getId());
114 114
 
115
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
115
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
116 116
 
117 117
 
118
-		$this->assertEquals( ['test'], $result );
118
+		$this->assertEquals(['test'], $result);
119 119
 
120 120
 		$object->clear();
121 121
 	}
@@ -123,48 +123,48 @@  discard block
 block discarded – undo
123 123
 
124 124
 	public function testCopyCouponException()
125 125
 	{
126
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
126
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
127 127
 		$ordBaseItem = $manager->createItem();
128 128
 
129
-		$ordBaseItem->addCoupon( '90AB', [] );
129
+		$ordBaseItem->addCoupon('90AB', []);
130 130
 
131 131
 
132
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
133
-			->setConstructorArgs( [$this->context] )
134
-			->setMethods( ['addCoupon'] )
132
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
133
+			->setConstructorArgs([$this->context])
134
+			->setMethods(['addCoupon'])
135 135
 			->getMock();
136 136
 
137
-		$object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) );
137
+		$object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception()));
138 138
 
139
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
139
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
140 140
 
141
-		$this->assertEquals( 1, count( $result ) );
142
-		$this->assertArrayHasKey( 'coupon', $result );
141
+		$this->assertEquals(1, count($result));
142
+		$this->assertArrayHasKey('coupon', $result);
143 143
 	}
144 144
 
145 145
 
146 146
 	public function testCopyProduct()
147 147
 	{
148
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
148
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
149 149
 		$ordBaseItem = $manager->createItem();
150 150
 
151
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
152
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
153
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
154
-		$ordBaseItem->addProduct( $ordProdItem );
151
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
152
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
153
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
154
+		$ordBaseItem->addProduct($ordProdItem);
155 155
 
156 156
 
157
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
158
-			->setConstructorArgs( [$this->context] )
159
-			->setMethods( null )
157
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
158
+			->setConstructorArgs([$this->context])
159
+			->setMethods(null)
160 160
 			->getMock();
161 161
 
162
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
162
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
163 163
 
164 164
 
165
-		$this->assertEquals( ['test'], $result );
166
-		$this->assertEquals( 1, count( $object->get()->getProducts() ) );
167
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct( 0 ) );
165
+		$this->assertEquals(['test'], $result);
166
+		$this->assertEquals(1, count($object->get()->getProducts()));
167
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct(0));
168 168
 
169 169
 		$object->clear();
170 170
 	}
@@ -172,56 +172,56 @@  discard block
 block discarded – undo
172 172
 
173 173
 	public function testCopyProductException()
174 174
 	{
175
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
175
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
176 176
 		$ordBaseItem = $manager->createItem();
177 177
 
178
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
179
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
180
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
181
-		$ordBaseItem->addProduct( $ordProdItem );
178
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
179
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
180
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
181
+		$ordBaseItem->addProduct($ordProdItem);
182 182
 
183 183
 
184
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
185
-			->setConstructorArgs( [$this->context] )
186
-			->setMethods( ['addProduct'] )
184
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
185
+			->setConstructorArgs([$this->context])
186
+			->setMethods(['addProduct'])
187 187
 			->getMock();
188 188
 
189
-		$object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) );
189
+		$object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception()));
190 190
 
191
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
191
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
192 192
 
193
-		$this->assertEquals( 1, count( $result ) );
194
-		$this->assertArrayHasKey( 'product', $result );
193
+		$this->assertEquals(1, count($result));
194
+		$this->assertArrayHasKey('product', $result);
195 195
 	}
196 196
 
197 197
 
198 198
 	public function testCopyServices()
199 199
 	{
200
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
200
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
201 201
 		$ordBaseItem = $manager->createItem();
202 202
 
203
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
204
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
203
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
204
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
205 205
 
206
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
207
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
206
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
207
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
208 208
 
209
-		$ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
209
+		$ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
210 210
 
211 211
 
212
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
213
-			->setConstructorArgs( [$this->context] )
214
-			->setMethods( null )
212
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
213
+			->setConstructorArgs([$this->context])
214
+			->setMethods(null)
215 215
 			->getMock();
216 216
 
217
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
217
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
218 218
 
219 219
 
220
-		$this->assertEquals( ['test'], $result );
221
-		$this->assertEquals( 1, count( $object->get()->getServices() ) );
220
+		$this->assertEquals(['test'], $result);
221
+		$this->assertEquals(1, count($object->get()->getServices()));
222 222
 
223
-		$service = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
224
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Service\Iface', $service );
223
+		$service = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
224
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Service\Iface', $service);
225 225
 
226 226
 		$object->clear();
227 227
 	}
@@ -229,77 +229,77 @@  discard block
 block discarded – undo
229 229
 
230 230
 	public function testCopyServicesException()
231 231
 	{
232
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
232
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
233 233
 		$ordBaseItem = $manager->createItem();
234 234
 
235
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
236
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
235
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
236
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
237 237
 
238
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
239
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
238
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
239
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
240 240
 
241
-		$ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
241
+		$ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
242 242
 
243 243
 
244
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
245
-			->setConstructorArgs( [$this->context] )
246
-			->setMethods( ['setService'] )
244
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
245
+			->setConstructorArgs([$this->context])
246
+			->setMethods(['setService'])
247 247
 			->getMock();
248 248
 
249
-		$object->expects( $this->once() )->method( 'setService' )->will( $this->throwException( new \Exception() ) );
249
+		$object->expects($this->once())->method('setService')->will($this->throwException(new \Exception()));
250 250
 
251
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
251
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
252 252
 
253
-		$this->assertEquals( 0, count( $result ) );
253
+		$this->assertEquals(0, count($result));
254 254
 	}
255 255
 
256 256
 
257 257
 	public function testGetOrderProductAttributes()
258 258
 	{
259
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
260
-			->setConstructorArgs( [$this->context] )
261
-			->setMethods( ['getAttributes'] )
259
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
260
+			->setConstructorArgs([$this->context])
261
+			->setMethods(['getAttributes'])
262 262
 			->getMock();
263 263
 
264
-		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )];
265
-		$object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) );
264
+		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])];
265
+		$object->expects($this->once())->method('getAttributes')->will($this->returnValue($list));
266 266
 
267 267
 		$values = new \stdClass(); // test for PHP bug
268 268
 		$values->{'1'} = 'test';
269
-		$result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], (array) $values] );
269
+		$result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], (array) $values]);
270 270
 
271
-		$this->assertEquals( 1, count( $result ) );
272
-		$this->assertEquals( 'test', $result[0]->getValue() );
271
+		$this->assertEquals(1, count($result));
272
+		$this->assertEquals('test', $result[0]->getValue());
273 273
 	}
274 274
 
275 275
 
276 276
 	/**
277 277
 	 * @param string $company
278 278
 	 */
279
-	protected function getAddress( $company )
279
+	protected function getAddress($company)
280 280
 	{
281
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'customer/address' );
281
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'customer/address');
282 282
 
283 283
 		$search = $manager->createSearch();
284
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
285
-		$items = $manager->searchItems( $search );
284
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
285
+		$items = $manager->searchItems($search);
286 286
 
287
-		if( ( $item = reset( $items ) ) === false ) {
288
-			throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) );
287
+		if (($item = reset($items)) === false) {
288
+			throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company));
289 289
 		}
290 290
 
291
-		$ordAddrManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base/address' );
292
-		$ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item );
291
+		$ordAddrManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base/address');
292
+		$ordAddrItem = $ordAddrManager->createItem()->copyFrom($item);
293 293
 
294 294
 		return $ordAddrItem;
295 295
 	}
296 296
 
297 297
 
298
-	protected function access( $name )
298
+	protected function access($name)
299 299
 	{
300
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' );
301
-		$method = $class->getMethod( $name );
302
-		$method->setAccessible( true );
300
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Base');
301
+		$method = $class->getMethod($name);
302
+		$method->setAccessible(true);
303 303
 
304 304
 		return $method;
305 305
 	}
Please login to merge, or discard this patch.