Completed
Push — master ( a37fad...1098fc )
by Aimeos
02:21
created
admin/jsonadm/templates/coupon/config/get-default.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,29 +9,29 @@  discard block
 block discarded – undo
9 9
 
10 10
 
11 11
 $options = 0;
12
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
12
+if (defined('JSON_PRETTY_PRINT')) {
13 13
 	$options = JSON_PRETTY_PRINT;
14 14
 }
15 15
 
16 16
 
17
-$fields = $this->param( 'fields', [] );
17
+$fields = $this->param('fields', []);
18 18
 
19
-foreach( (array) $fields as $resource => $list ) {
20
-	$fields[$resource] = array_flip( explode( ',', $list ) );
19
+foreach ((array) $fields as $resource => $list) {
20
+	$fields[$resource] = array_flip(explode(',', $list));
21 21
 }
22 22
 
23 23
 
24
-$build = function( array $attrItems, $id ) use ( $fields )
24
+$build = function(array $attrItems, $id) use ($fields)
25 25
 {
26 26
 	$result = [];
27 27
 	$type = 'criteria/attribute';
28 28
 
29
-	foreach( $attrItems as $attrItem )
29
+	foreach ($attrItems as $attrItem)
30 30
 	{
31
-		$attributes = $attrItem->toArray( true );
31
+		$attributes = $attrItem->toArray(true);
32 32
 
33
-		if( isset( $fields[$type] ) ) {
34
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
33
+		if (isset($fields[$type])) {
34
+			$attributes = array_intersect_key($attributes, $fields[$type]);
35 35
 		}
36 36
 
37 37
 		$result[] = array(
@@ -45,23 +45,23 @@  discard block
 block discarded – undo
45 45
 };
46 46
 
47 47
 
48
-$configItems = $this->get( 'configItems', [] );
48
+$configItems = $this->get('configItems', []);
49 49
 
50 50
 
51 51
 ?>
52 52
 {
53 53
 	"meta": {
54
-		"total": <?= count( $configItems ); ?>
54
+		"total": <?= count($configItems); ?>
55 55
 
56 56
 	}
57 57
 
58
-	<?php if( isset( $this->errors ) ) : ?>
58
+	<?php if (isset($this->errors)) : ?>
59 59
 
60
-		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
60
+		, "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
61 61
 
62 62
 	<?php else : ?>
63 63
 
64
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
64
+		, "data": <?= json_encode($build($configItems, $this->param('id')), $options); ?>
65 65
 
66 66
 	<?php endif; ?>
67 67
 }
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Coupon/Config/StandardTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 		$this->context = \TestHelperJadm::getContext();
23 23
 		$this->view = $this->context->getView();
24 24
 
25
-		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard( $this->context, $this->view, $templatePaths, 'coupon/config' );
25
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Config\Standard($this->context, $this->view, $templatePaths, 'coupon/config');
26 26
 	}
27 27
 
28 28
 
@@ -31,20 +31,20 @@  discard block
 block discarded – undo
31 31
 		$params = array(
32 32
 			'id' => 'Example,Required,BasketValues',
33 33
 		);
34
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
35
-		$this->view->addHelper( 'param', $helper );
34
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
35
+		$this->view->addHelper('param', $helper);
36 36
 
37
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
38
-		$result = json_decode( (string) $response->getBody(), true );
37
+		$response = $this->object->get($this->view->request(), $this->view->response());
38
+		$result = json_decode((string) $response->getBody(), true);
39 39
 
40
-		$this->assertEquals( 200, $response->getStatusCode() );
41
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
40
+		$this->assertEquals(200, $response->getStatusCode());
41
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
42 42
 
43
-		$this->assertEquals( 2, $result['meta']['total'] );
44
-		$this->assertInternalType( 'array', $result['data'] );
45
-		$this->assertEquals( 'basketvalues.total-value-min', $result['data'][0]['id'] );
46
-		$this->assertEquals( 'basketvalues.total-value-max', $result['data'][1]['id'] );
43
+		$this->assertEquals(2, $result['meta']['total']);
44
+		$this->assertInternalType('array', $result['data']);
45
+		$this->assertEquals('basketvalues.total-value-min', $result['data'][0]['id']);
46
+		$this->assertEquals('basketvalues.total-value-max', $result['data'][1]['id']);
47 47
 
48
-		$this->assertArrayNotHasKey( 'errors', $result );
48
+		$this->assertArrayNotHasKey('errors', $result);
49 49
 	}
50 50
 }
51 51
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Coupon/Config/Standard.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -110,30 +110,30 @@  discard block
 block discarded – undo
110 110
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
111 111
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
112 112
 	 */
113
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
113
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
114 114
 	{
115 115
 		$view = $this->getView();
116 116
 
117 117
 		try
118 118
 		{
119
-			$response = $this->getItems( $view, $request, $response );
119
+			$response = $this->getItems($view, $request, $response);
120 120
 			$status = 200;
121 121
 		}
122
-		catch( \Aimeos\MShop\Exception $e )
122
+		catch (\Aimeos\MShop\Exception $e)
123 123
 		{
124 124
 			$status = 404;
125
-			$view->errors = array( array(
126
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
125
+			$view->errors = array(array(
126
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
127 127
 				'detail' => $e->getTraceAsString(),
128
-			) );
128
+			));
129 129
 		}
130
-		catch( \Exception $e )
130
+		catch (\Exception $e)
131 131
 		{
132 132
 			$status = 500;
133
-			$view->errors = array( array(
133
+			$view->errors = array(array(
134 134
 				'title' => $e->getMessage(),
135 135
 				'detail' => $e->getTraceAsString(),
136
-			) );
136
+			));
137 137
 		}
138 138
 
139 139
 		/** admin/jsonadm/coupon/config/template-get
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
 		$tplconf = 'admin/jsonadm/coupon/config/template-get';
159 159
 		$default = 'coupon/config/get-default.php';
160 160
 
161
-		$body = $view->render( $view->config( $tplconf, $default ) );
161
+		$body = $view->render($view->config($tplconf, $default));
162 162
 
163
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
164
-			->withBody( $view->response()->createStreamFromString( $body ) )
165
-			->withStatus( $status );
163
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
164
+			->withBody($view->response()->createStreamFromString($body))
165
+			->withStatus($status);
166 166
 	}
167 167
 
168 168
 
@@ -174,18 +174,18 @@  discard block
 block discarded – undo
174 174
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
175 175
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
176 176
 	 */
177
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
177
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
178 178
 	{
179
-		if( ( $id = $view->param( 'id' ) ) == null ) {
180
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
179
+		if (($id = $view->param('id')) == null) {
180
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
181 181
 		}
182 182
 
183
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
183
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
184 184
 
185 185
 		$item = $manager->createItem();
186
-		$item->setProvider( $id );
186
+		$item->setProvider($id);
187 187
 
188
-		$view->configItems = $manager->getProvider( $item, null )->getConfigBE();
188
+		$view->configItems = $manager->getProvider($item, null)->getConfigBE();
189 189
 
190 190
 		return $response;
191 191
 	}
Please login to merge, or discard this patch.