Completed
Push — master ( 0f8cdd...111117 )
by Aimeos
02:27
created
admin/jsonadm/templates/config-standard.php 2 patches
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.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,9 +59,12 @@
 block discarded – undo
59 59
 
60 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
-	<?php else : ?>
62
+	<?php else {
63
+	: ?>
63 64
 
64
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
65
+		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options );
66
+}
67
+?>
65 68
 
66 69
 	<?php endif; ?>
67 70
 }
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Price/StandardTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 		$this->context = \TestHelperJadm::getContext();
22 22
 		$this->view = $this->context->getView();
23 23
 
24
-		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard( $this->context, 'price' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard($this->context, 'price');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,26 +31,26 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'price.value' => '12.95' )
34
+				'==' => array('price.value' => '12.95')
35 35
 			),
36 36
 			'include' => 'attribute'
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40 40
 
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43 43
 
44 44
 
45
-		$this->assertEquals( 200, $response->getStatusCode() );
46
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
45
+		$this->assertEquals(200, $response->getStatusCode());
46
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
47 47
 
48
-		$this->assertGreaterThan( 1, $result['meta']['total'] );
49
-		$this->assertGreaterThan( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'price', $result['data'][0]['type'] );
51
-		$this->assertEquals( 0, count( $result['data'][0]['relationships'] ) );
52
-		$this->assertEquals( 0, count( $result['included'] ) );
48
+		$this->assertGreaterThan(1, $result['meta']['total']);
49
+		$this->assertGreaterThan(1, count($result['data']));
50
+		$this->assertEquals('price', $result['data'][0]['type']);
51
+		$this->assertEquals(0, count($result['data'][0]['relationships']));
52
+		$this->assertEquals(0, count($result['included']));
53 53
 
54
-		$this->assertArrayNotHasKey( 'errors', $result );
54
+		$this->assertArrayNotHasKey('errors', $result);
55 55
 	}
56 56
 }
57 57
\ No newline at end of file
Please login to merge, or discard this patch.