Completed
Push — master ( a897c1...388e1c )
by Aimeos
05:34
created
controller/frontend/src/Controller/Frontend/Catalog/Standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function createFilter()
32 32
 	{
33
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
33
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
34 34
 	}
35 35
 
36 36
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
43 43
 	 * @since 2017.03
44 44
 	 */
45
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
45
+	public function getPath($id, array $domains = array('text', 'media'))
46 46
 	{
47
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
47
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
48 48
 	}
49 49
 
50 50
 
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
60 60
 	 * @since 2017.03
61 61
 	 */
62
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
63
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
62
+	public function getTree($id = null, array $domains = array('text', 'media'),
63
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
64 64
 	{
65
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
65
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php 2 patches
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@  discard block
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
44
-		$productItem = $productManager->getItem( $prodid, [], true );
43
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
44
+		$productItem = $productManager->getItem($prodid, [], true);
45 45
 
46
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
46
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
47 47
 		{
48 48
 			return $this->getController()->addProduct(
49 49
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,29 +51,29 @@  discard block
 block discarded – undo
51 51
 			);
52 52
 		}
53 53
 
54
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
55
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
54
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
55
+		$prices = $productItem->getRefItems('price', 'default', 'default');
56 56
 
57
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
58
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
57
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
58
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
59 59
 
60
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
60
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
61 61
 
62 62
 		$attributeMap = [
63
-			'custom' => array_keys( $customAttributeValues ),
64
-			'config' => array_keys( $configAttributeIds ),
63
+			'custom' => array_keys($customAttributeValues),
64
+			'config' => array_keys($configAttributeIds),
65 65
 			'hidden' => $hiddenAttributeIds,
66 66
 		];
67
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
67
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
68 68
 
69
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues ) );
70
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ) );
71
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
69
+		$attr = array_merge($attr, $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues));
70
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds));
71
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
72 72
 
73
-		$orderBaseProductItem->setAttributes( $attr );
74
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
73
+		$orderBaseProductItem->setAttributes($attr);
74
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
75 75
 
76
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
76
+		$this->getController()->get()->addProduct($orderBaseProductItem);
77 77
 		$this->getController()->save();
78 78
 	}
79 79
 
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
89 89
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
90 90
 	 */
91
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
92
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
91
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
92
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
93 93
 	{
94 94
 		$attr = [];
95 95
 		$context = $this->getContext();
96
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
96
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
97 97
 
98 98
 		/** controller/frontend/basket/require-variant
99 99
 		 * A variant of a selection product must be chosen
@@ -114,47 +114,47 @@  discard block
 block discarded – undo
114 114
 		 * @category Developer
115 115
 		 * @category User
116 116
 		 */
117
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
117
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
118 118
 
119 119
 
120
-		if( count( $productItems ) > 1 )
120
+		if (count($productItems) > 1)
121 121
 		{
122
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
123
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
122
+			$msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"');
123
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
124 124
 		}
125
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
125
+		else if (($result = reset($productItems)) !== false) // count == 1
126 126
 		{
127 127
 			$productItem = $result;
128
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
128
+			$orderBaseProductItem->setProductCode($productItem->getCode());
129 129
 
130
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
130
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
131 131
 
132
-			if( !empty( $subprices ) ) {
132
+			if (!empty($subprices)) {
133 133
 				$prices = $subprices;
134 134
 			}
135 135
 
136
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
136
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
137 137
 
138
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
139
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
138
+			if (($mediaItem = reset($submedia)) !== false) {
139
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
140 140
 			}
141 141
 
142
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
143
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
142
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
143
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
144 144
 
145
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
145
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
146 146
 			{
147 147
 				$orderAttributeItem = $orderProductAttrManager->createItem();
148
-				$orderAttributeItem->copyFrom( $attrItem );
149
-				$orderAttributeItem->setType( 'variant' );
148
+				$orderAttributeItem->copyFrom($attrItem);
149
+				$orderAttributeItem->setType('variant');
150 150
 
151 151
 				$attr[] = $orderAttributeItem;
152 152
 			}
153 153
 		}
154
-		else if( $requireVariant != false ) // count == 0
154
+		else if ($requireVariant != false) // count == 0
155 155
 		{
156
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
157
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
156
+			$msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"');
157
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
158 158
 		}
159 159
 
160 160
 		return $attr;
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,10 +121,11 @@  discard block
 block discarded – undo
121 121
 		{
122 122
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
123 123
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
124
-		}
125
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
124
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
125
+			// count == 1
126 126
 		{
127 127
 			$productItem = $result;
128
+		}
128 129
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
129 130
 
130 131
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -150,10 +151,11 @@  discard block
 block discarded – undo
150 151
 
151 152
 				$attr[] = $orderAttributeItem;
152 153
 			}
153
-		}
154
-		else if( $requireVariant != false ) // count == 0
154
+		} else if( $requireVariant != false ) {
155
+			// count == 0
155 156
 		{
156 157
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
158
+		}
157 159
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
158 160
 		}
159 161
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Decorator/Category.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@
 block discarded – undo
36 36
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
37 37
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
38 38
 	 */
39
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
39
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
40
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
41 41
 	{
42 42
 		$context = $this->getContext();
43
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
43
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
44 44
 
45
-		$search = $catalogListManager->createSearch( true );
45
+		$search = $catalogListManager->createSearch(true);
46 46
 		$expr = array(
47
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
48
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
47
+			$search->compare('==', 'catalog.lists.domain', 'product'),
48
+			$search->compare('==', 'catalog.lists.refid', $prodid),
49 49
 			$search->getConditions()
50 50
 		);
51
-		$search->setConditions( $search->combine( '&&', $expr ) );
52
-		$search->setSlice( 0, 1 );
51
+		$search->setConditions($search->combine('&&', $expr));
52
+		$search->setSlice(0, 1);
53 53
 
54
-		$result = $catalogListManager->searchItems( $search );
54
+		$result = $catalogListManager->searchItems($search);
55 55
 
56
-		if( reset( $result ) === false )
56
+		if (reset($result) === false)
57 57
 		{
58
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Adding product with ID "%1$s" is not allowed' );
59
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $prodid ) );
58
+			$msg = $context->getI18n()->dt('controller/frontend', 'Adding product with ID "%1$s" is not allowed');
59
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $prodid));
60 60
 		}
61 61
 
62 62
 		$this->getController()->addProduct(
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/Decorator/Base.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@
 block discarded – undo
133 133
 	/**
134 134
 	 * Returns the frontend controller
135 135
 	 *
136
-	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Frontend controller object
136
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
137 137
 	 */
138 138
 	protected function getController()
139 139
 	{
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 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\Subscription\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
 
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 	 * @param string $id Unique subscription ID
66 66
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
67 67
 	 */
68
-	public function cancel( $id )
68
+	public function cancel($id)
69 69
 	{
70
-		return $this->controller->cancel( $id );
70
+		return $this->controller->cancel($id);
71 71
 	}
72 72
 
73 73
 
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
 	 * @param string $id Unique subscription ID
100 100
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
101 101
 	 */
102
-	public function getItem( $id )
102
+	public function getItem($id)
103 103
 	{
104
-		return $this->controller->getItem( $id );
104
+		return $this->controller->getItem($id);
105 105
 	}
106 106
 
107 107
 
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
112 112
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
113 113
 	 */
114
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item )
114
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item)
115 115
 	{
116
-		return $this->controller->saveItem( $item );
116
+		return $this->controller->saveItem($item);
117 117
 	}
118 118
 
119 119
 
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 	 * @param integer &$total|null Variable that will contain the total number of available items
125 125
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription objects as values
126 126
 	 */
127
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
127
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
128 128
 	{
129
-		return $this->controller->searchItems( $filter, $total );
129
+		return $this->controller->searchItems($filter, $total);
130 130
 	}
131 131
 
132 132
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/Iface.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param string $id Unique subscription ID
26 26
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
27 27
 	 */
28
-	public function cancel( $id );
28
+	public function cancel($id);
29 29
 
30 30
 	/**
31 31
 	 * Returns the filter for searching items
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 * @param string $id Unique subscription ID
48 48
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
49 49
 	 */
50
-	public function getItem( $id );
50
+	public function getItem($id);
51 51
 
52 52
 	/**
53 53
 	 * Saves the modified subscription item
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
56 56
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
57 57
 	 */
58
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item );
58
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item);
59 59
 
60 60
 	/**
61 61
 	 * Returns the subscription items based on the given filter that belong to the current user
@@ -64,5 +64,5 @@  discard block
 block discarded – undo
64 64
 	 * @param integer &$total|null Variable that will contain the total number of available items
65 65
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription objects as values
66 66
 	 */
67
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
67
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
68 68
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Subscription/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\Subscription\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/subscription/name
34 34
 		 * Class name of the used subscription frontend controller implementation
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 		 * @since 2018.04
64 64
 		 * @category Developer
65 65
 		 */
66
-		if( $name === null ) {
67
-			$name = $context->getConfig()->get( 'controller/frontend/subscription/name', 'Standard' );
66
+		if ($name === null) {
67
+			$name = $context->getConfig()->get('controller/frontend/subscription/name', 'Standard');
68 68
 		}
69 69
 
70
-		if( ctype_alnum( $name ) === false ) {
71
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>';
72
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
70
+		if (ctype_alnum($name) === false) {
71
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name : '<not a string>';
72
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
73 73
 		}
74 74
 
75 75
 		$iface = '\\Aimeos\\Controller\\Frontend\\Subscription\\Iface';
76 76
 		$classname = '\\Aimeos\\Controller\\Frontend\\Subscription\\' . $name;
77 77
 
78
-		$manager = self::createControllerBase( $context, $classname, $iface );
78
+		$manager = self::createControllerBase($context, $classname, $iface);
79 79
 
80 80
 		/** controller/frontend/subscription/decorators/excludes
81 81
 		 * Excludes decorators added by the "common" option from the subscription frontend controllers
@@ -151,6 +151,6 @@  discard block
 block discarded – undo
151 151
 		 * @see controller/frontend/subscription/decorators/excludes
152 152
 		 * @see controller/frontend/subscription/decorators/global
153 153
 		 */
154
-		return self::addControllerDecorators( $context, $manager, 'subscription' );
154
+		return self::addControllerDecorators($context, $manager, 'subscription');
155 155
 	}
156 156
 }
Please login to merge, or discard this patch.
frontend/tests/Controller/Frontend/Subscription/Decorator/BaseTest.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -20,122 +20,122 @@
 block discarded – undo
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22 22
 
23
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Standard' )
23
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\Standard')
24 24
 			->disableOriginalConstructor()
25 25
 			->getMock();
26 26
 
27
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Decorator\Base' )
28
-			->setConstructorArgs( [$this->stub, $this->context] )
27
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\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\Subscription\Decorator\Base' )
46
-			->setConstructorArgs( [$stub, $this->context] )
45
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\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\Subscription\Standard' )
53
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\Standard')
54 54
 			->disableOriginalConstructor()
55
-			->setMethods( ['invalid'] )
55
+			->setMethods(['invalid'])
56 56
 			->getMock();
57 57
 
58
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Decorator\Base' )
59
-			->setConstructorArgs( [$stub, $this->context] )
58
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\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 testCancel()
69 69
 	{
70
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
70
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
71 71
 
72
-		$this->stub->expects( $this->once() )->method( 'cancel' )->will( $this->returnValue( $item ) );
72
+		$this->stub->expects($this->once())->method('cancel')->will($this->returnValue($item));
73 73
 
74
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->cancel( -1, '' ) );
74
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->cancel( -1, '' ));
75 75
 	}
76 76
 
77 77
 
78 78
 	public function testCreateFilter()
79 79
 	{
80
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createSearch();
80
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createSearch();
81 81
 
82
-		$this->stub->expects( $this->once() )->method( 'createFilter' )->will( $this->returnValue( $search ) );
82
+		$this->stub->expects($this->once())->method('createFilter')->will($this->returnValue($search));
83 83
 
84
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
84
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
85 85
 	}
86 86
 
87 87
 
88 88
 	public function testGetItem()
89 89
 	{
90
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
90
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
91 91
 
92
-		$this->stub->expects( $this->once() )->method( 'getItem' )->will( $this->returnValue( $item ) );
92
+		$this->stub->expects($this->once())->method('getItem')->will($this->returnValue($item));
93 93
 
94
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem( -1 ) );
94
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem( -1 ));
95 95
 	}
96 96
 
97 97
 
98 98
 	public function testSaveItem()
99 99
 	{
100
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
100
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
101 101
 
102
-		$this->stub->expects( $this->once() )->method( 'saveItem' );
102
+		$this->stub->expects($this->once())->method('saveItem');
103 103
 
104
-		$this->object->saveItem( $item );
104
+		$this->object->saveItem($item);
105 105
 	}
106 106
 
107 107
 
108 108
 	public function testSearchItems()
109 109
 	{
110
-		$search = $this->getMockBuilder( '\Aimeos\MW\Criteria\Iface' )->getMock();
110
+		$search = $this->getMockBuilder('\Aimeos\MW\Criteria\Iface')->getMock();
111 111
 
112
-		$this->stub->expects( $this->once() )->method( 'searchItems' )->will( $this->returnValue( [] ) );
112
+		$this->stub->expects($this->once())->method('searchItems')->will($this->returnValue([]));
113 113
 
114
-		$this->assertEquals( [], $this->object->searchItems( $search ) );
114
+		$this->assertEquals([], $this->object->searchItems($search));
115 115
 	}
116 116
 
117 117
 
118 118
 	public function testGetIntervals()
119 119
 	{
120
-		$this->stub->expects( $this->once() )->method( 'getIntervals' )->will( $this->returnValue( [] ) );
120
+		$this->stub->expects($this->once())->method('getIntervals')->will($this->returnValue([]));
121 121
 
122
-		$this->assertEquals( [], $this->object->getIntervals() );
122
+		$this->assertEquals([], $this->object->getIntervals());
123 123
 	}
124 124
 
125 125
 
126 126
 	public function testGetController()
127 127
 	{
128
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
128
+		$result = $this->access('getController')->invokeArgs($this->object, []);
129 129
 
130
-		$this->assertSame( $this->stub, $result );
130
+		$this->assertSame($this->stub, $result);
131 131
 	}
132 132
 
133 133
 
134
-	protected function access( $name )
134
+	protected function access($name)
135 135
 	{
136
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Subscription\Decorator\Base' );
137
-		$method = $class->getMethod( $name );
138
-		$method->setAccessible( true );
136
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Subscription\Decorator\Base');
137
+		$method = $class->getMethod($name);
138
+		$method->setAccessible(true);
139 139
 
140 140
 		return $method;
141 141
 	}
Please login to merge, or discard this patch.
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.