Completed
Push — master ( deac36...c1ac02 )
by Aimeos
03:39
created
controller/frontend/tests/Controller/Frontend/Subscription/StandardTest.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -17,104 +17,104 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		\Aimeos\MShop\Factory::setCache( true );
20
+		\Aimeos\MShop\Factory::setCache(true);
21 21
 
22 22
 		$this->context = \TestHelperFrontend::getContext();
23
-		$this->object = new \Aimeos\Controller\Frontend\Subscription\Standard( $this->context );
23
+		$this->object = new \Aimeos\Controller\Frontend\Subscription\Standard($this->context);
24 24
 	}
25 25
 
26 26
 
27 27
 	protected function tearDown()
28 28
 	{
29
-		unset( $this->object, $this->context );
29
+		unset($this->object, $this->context);
30 30
 
31
-		\Aimeos\MShop\Factory::setCache( false );
31
+		\Aimeos\MShop\Factory::setCache(false);
32 32
 		\Aimeos\MShop\Factory::clear();
33 33
 	}
34 34
 
35 35
 
36 36
 	public function testCancel()
37 37
 	{
38
-		$this->context->setUserId( $this->getCustomerId() );
39
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
38
+		$this->context->setUserId($this->getCustomerId());
39
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
40 40
 
41
-		$cntl = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Standard' )
42
-			->setConstructorArgs( [$this->context] )
43
-			->setMethods( ['saveItem'] )
41
+		$cntl = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\Standard')
42
+			->setConstructorArgs([$this->context])
43
+			->setMethods(['saveItem'])
44 44
 			->getMock();
45 45
 
46
-		$cntl->expects( $this->once() )->method( 'saveItem' )
47
-			->will( $this->returnValue( $item ) );
46
+		$cntl->expects($this->once())->method('saveItem')
47
+			->will($this->returnValue($item));
48 48
 
49
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel( $this->getSubscriptionId() ) );
49
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel($this->getSubscriptionId()));
50 50
 	}
51 51
 
52 52
 
53 53
 	public function testCreateFilter()
54 54
 	{
55
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
55
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
56 56
 	}
57 57
 
58 58
 
59 59
 	public function testGetIntervals()
60 60
 	{
61
-		$this->assertGreaterThan( 0, count( $this->object->getIntervals() ) );
61
+		$this->assertGreaterThan(0, count($this->object->getIntervals()));
62 62
 	}
63 63
 
64 64
 
65 65
 	public function testGetItem()
66 66
 	{
67 67
 		$id = $this->getSubscriptionId();
68
-		$this->context->setUserId( $this->getCustomerId() );
68
+		$this->context->setUserId($this->getCustomerId());
69 69
 
70
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem( $id ) );
70
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem($id));
71 71
 	}
72 72
 
73 73
 
74 74
 	public function testGetItemException()
75 75
 	{
76
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Subscription\Exception' );
76
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Subscription\Exception');
77 77
 		$this->object->getItem( -1 );
78 78
 	}
79 79
 
80 80
 
81 81
 	public function testSaveItem()
82 82
 	{
83
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
84
-			->setConstructorArgs( [$this->context] )
85
-			->setMethods( ['saveItem'] )
83
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
84
+			->setConstructorArgs([$this->context])
85
+			->setMethods(['saveItem'])
86 86
 			->getMock();
87 87
 
88
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $manager );
88
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $manager);
89 89
 
90
-		$manager->expects( $this->once() )->method( 'saveItem' )
91
-			->will( $this->returnValue( $manager->createItem() ) );
90
+		$manager->expects($this->once())->method('saveItem')
91
+			->will($this->returnValue($manager->createItem()));
92 92
 
93
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
93
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->saveItem($manager->createItem()));
94 94
 	}
95 95
 
96 96
 
97 97
 	public function testSearchItems()
98 98
 	{
99
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
99
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
100 100
 	}
101 101
 
102 102
 	protected function getCustomerId()
103 103
 	{
104
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
105
-		return $manager->findItem( 'UTC001' )->getId();
104
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
105
+		return $manager->findItem('UTC001')->getId();
106 106
 	}
107 107
 
108 108
 
109 109
 	protected function getSubscriptionId()
110 110
 	{
111
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
112
-		$search = $manager->createSearch()->setSlice( 0, 1 );
113
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $this->getCustomerId() ) );
114
-		$result = $manager->searchItems( $search );
111
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
112
+		$search = $manager->createSearch()->setSlice(0, 1);
113
+		$search->setConditions($search->compare('==', 'order.base.customerid', $this->getCustomerId()));
114
+		$result = $manager->searchItems($search);
115 115
 
116
-		if( ( $item = reset( $result ) ) === false ) {
117
-			throw new \RuntimeException( 'No subscription item found' );
116
+		if (($item = reset($result)) === false) {
117
+			throw new \RuntimeException('No subscription item found');
118 118
 		}
119 119
 
120 120
 		return $item->getId();
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Subscription/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\\Subscription\\Iface';
17 17
 
18
-		$controller = \Aimeos\Controller\Frontend\Subscription\Factory::createController( \TestHelperFrontend::getContext() );
19
-		$this->assertInstanceOf( $target, $controller );
18
+		$controller = \Aimeos\Controller\Frontend\Subscription\Factory::createController(\TestHelperFrontend::getContext());
19
+		$this->assertInstanceOf($target, $controller);
20 20
 
21
-		$controller = \Aimeos\Controller\Frontend\Subscription\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
22
-		$this->assertInstanceOf( $target, $controller );
21
+		$controller = \Aimeos\Controller\Frontend\Subscription\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\Subscription\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
29
+		\Aimeos\Controller\Frontend\Subscription\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\Subscription\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
35
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
36
+		\Aimeos\Controller\Frontend\Subscription\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\Subscription\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
42
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
43
+		\Aimeos\Controller\Frontend\Subscription\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/Standard.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
 	 * @param string $id Unique subscription ID
28 28
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
29 29
 	 */
30
-	public function cancel( $id )
30
+	public function cancel($id)
31 31
 	{
32
-		$item = $this->getItem( $id );
33
-		$item->setDateEnd( $item->getDateNext() );
32
+		$item = $this->getItem($id);
33
+		$item->setDateEnd($item->getDateNext());
34 34
 
35
-		return $this->saveItem( $item );
35
+		return $this->saveItem($item);
36 36
 	}
37 37
 
38 38
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 */
44 44
 	public function createFilter()
45 45
 	{
46
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' )->createSearch();
46
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription')->createSearch();
47 47
 	}
48 48
 
49 49
 
@@ -53,25 +53,25 @@  discard block
 block discarded – undo
53 53
 	 * @param string $id Unique subscription ID
54 54
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
55 55
 	 */
56
-	public function getItem( $id )
56
+	public function getItem($id)
57 57
 	{
58 58
 		$context = $this->getContext();
59
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
59
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
60 60
 
61 61
 		$filter = $manager->createSearch();
62 62
 		$expr = [
63
-			$filter->compare( '==', 'subscription.id', $id ),
64
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
63
+			$filter->compare('==', 'subscription.id', $id),
64
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
65 65
 			$filter->getConditions(),
66 66
 		];
67
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
67
+		$filter->setConditions($filter->combine('&&', $expr));
68 68
 
69
-		$items = $this->searchItems( $filter );
69
+		$items = $this->searchItems($filter);
70 70
 
71
-		if( ( $item = reset( $items ) ) === false )
71
+		if (($item = reset($items)) === false)
72 72
 		{
73 73
 			$msg = 'Invalid subscription ID "%1$s" for customer ID "%2$s"';
74
-			throw new \Aimeos\Controller\Frontend\Subscription\Exception( sprintf( $msg, $id, $context->getUserId() ) );
74
+			throw new \Aimeos\Controller\Frontend\Subscription\Exception(sprintf($msg, $id, $context->getUserId()));
75 75
 		}
76 76
 
77 77
 		return $item;
@@ -86,18 +86,18 @@  discard block
 block discarded – undo
86 86
 	public function getIntervals()
87 87
 	{
88 88
 		$intervals = [];
89
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
89
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
90 90
 
91
-		$search = $manager->createSearch( true );
91
+		$search = $manager->createSearch(true);
92 92
 		$expr = array(
93 93
 			$search->getConditions(),
94
-			$search->compare( '==', 'attribute.domain', 'product' ),
95
-			$search->compare( '==', 'attribute.type.code', 'interval' ),
94
+			$search->compare('==', 'attribute.domain', 'product'),
95
+			$search->compare('==', 'attribute.type.code', 'interval'),
96 96
 		);
97
-		$search->setConditions( $search->combine( '&&', $expr ) );
98
-		$search->setSlice( 0, 0x7fffffff );
97
+		$search->setConditions($search->combine('&&', $expr));
98
+		$search->setSlice(0, 0x7fffffff);
99 99
 
100
-		foreach( $manager->searchItems( $search, ['text'] ) as $attrItem ) {
100
+		foreach ($manager->searchItems($search, ['text']) as $attrItem) {
101 101
 			$intervals[$attrItem->getCode()] = $attrItem;
102 102
 		}
103 103
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
111 111
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
112 112
 	 */
113
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item )
113
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item)
114 114
 	{
115
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' )->saveItem( $item );
115
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription')->saveItem($item);
116 116
 	}
117 117
 
118 118
 
@@ -123,17 +123,17 @@  discard block
 block discarded – undo
123 123
 	 * @param integer &$total|null Variable that will contain the total number of available items
124 124
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription objects as values
125 125
 	 */
126
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
126
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
127 127
 	{
128 128
 		$context = $this->getContext();
129
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
129
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
130 130
 
131 131
 		$expr = [
132
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
132
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
133 133
 			$filter->getConditions(),
134 134
 		];
135
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
135
+		$filter->setConditions($filter->combine('&&', $expr));
136 136
 
137
-		return $manager->searchItems( $filter, [], $total );
137
+		return $manager->searchItems($filter, [], $total);
138 138
 	}
139 139
 }
Please login to merge, or discard this patch.