Completed
Push — master ( 38c658...e8462d )
by Aimeos
01:48
created
admin/jsonadm/tests/bootstrap.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@
 block discarded – undo
7 7
 
8 8
 
9 9
 error_reporting( -1 );
10
-ini_set( 'display_errors', '1' );
10
+ini_set('display_errors', '1');
11 11
 
12
-date_default_timezone_set( 'UTC' );
12
+date_default_timezone_set('UTC');
13 13
 
14 14
 // Set locale settings to reasonable defaults
15
-setlocale( LC_ALL, 'en_US.UTF-8' );
16
-setlocale( LC_NUMERIC, 'POSIX' );
17
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
18
-setlocale( LC_TIME, 'POSIX' );
15
+setlocale(LC_ALL, 'en_US.UTF-8');
16
+setlocale(LC_NUMERIC, 'POSIX');
17
+setlocale(LC_CTYPE, 'en_US.UTF-8');
18
+setlocale(LC_TIME, 'POSIX');
19 19
 
20 20
 require_once 'TestHelperJadm.php';
21 21
 \TestHelperJadm::bootstrap();
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/errors-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 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
-echo json_encode( $this->get( 'errors', [] ), $options );
18 17
\ No newline at end of file
18
+echo json_encode($this->get('errors', []), $options);
19 19
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/included-standard.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -9,35 +9,35 @@  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 $items ) use ( $fields )
24
+$build = function(array $items) use ($fields)
25 25
 {
26 26
 	$list = [];
27 27
 
28
-	$target = $this->config( 'admin/jsonadm/url/target' );
29
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
30
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
31
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
28
+	$target = $this->config('admin/jsonadm/url/target');
29
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
30
+	$action = $this->config('admin/jsonadm/url/action', 'get');
31
+	$config = $this->config('admin/jsonadm/url/config', []);
32 32
 
33
-	foreach( (array) $items as $item )
33
+	foreach ((array) $items as $item)
34 34
 	{
35 35
 		$id = $item->getId();
36 36
 		$type = $item->getResourceType();
37
-		$attributes = $item->toArray( true );
37
+		$attributes = $item->toArray(true);
38 38
 
39
-		if( isset( $fields[$type] ) ) {
40
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
39
+		if (isset($fields[$type])) {
40
+			$attributes = array_intersect_key($attributes, $fields[$type]);
41 41
 		}
42 42
 
43 43
 		$list[] = array(
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 			'type' => $type,
46 46
 			'attributes' => $attributes,
47 47
 			'links' => array(
48
-				'self' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => $id ), [], $config ),
48
+				'self' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => $id), [], $config),
49 49
 				'related' => array(
50
-					'href' => $this->url( $target, $cntl, $action, array( 'resource' => $type, 'id' => null ), [], $config )
50
+					'href' => $this->url($target, $cntl, $action, array('resource' => $type, 'id' => null), [], $config)
51 51
 				)
52 52
 			)
53 53
 		);
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 
59 59
 
60 60
 $response = [];
61
-$response = $build( $this->get( 'childItems', [] ) );
62
-$response = array_merge( $response, $build( $this->get( 'refItems', [] ) ) );
61
+$response = $build($this->get('childItems', []));
62
+$response = array_merge($response, $build($this->get('refItems', [])));
63 63
 
64 64
 
65
-echo json_encode( $response, $options );
66 65
\ No newline at end of file
66
+echo json_encode($response, $options);
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/order/data-standard.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -9,33 +9,33 @@  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( \Aimeos\MShop\Order\Item\Iface $item, array $childItems ) use ( $fields )
24
+$build = function(\Aimeos\MShop\Order\Item\Iface $item, array $childItems) use ($fields)
25 25
 {
26 26
 	$id = $item->getId();
27 27
 	$baseId = $item->getBaseId();
28 28
 	$type = $item->getResourceType();
29
-	$params = array( 'resource' => $item->getResourceType(), 'id' => $id );
30
-	$attributes = $item->toArray( true );
29
+	$params = array('resource' => $item->getResourceType(), 'id' => $id);
30
+	$attributes = $item->toArray(true);
31 31
 
32
-	$target = $this->config( 'admin/jsonadm/url/target' );
33
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
34
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
35
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
32
+	$target = $this->config('admin/jsonadm/url/target');
33
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
34
+	$action = $this->config('admin/jsonadm/url/action', 'get');
35
+	$config = $this->config('admin/jsonadm/url/config', []);
36 36
 
37
-	if( isset( $fields[$type] ) ) {
38
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
37
+	if (isset($fields[$type])) {
38
+		$attributes = array_intersect_key($attributes, $fields[$type]);
39 39
 	}
40 40
 
41 41
 	$result = array(
@@ -43,25 +43,25 @@  discard block
 block discarded – undo
43 43
 		'type' => $type,
44 44
 		'attributes' => $attributes,
45 45
 		'links' => array(
46
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
46
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
47 47
 		),
48 48
 		'relationships' => []
49 49
 	);
50 50
 
51
-	foreach( $childItems as $childId => $childItem )
51
+	foreach ($childItems as $childId => $childItem)
52 52
 	{
53
-		if( $childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
53
+		if ($childItem instanceof \Aimeos\MShop\Order\Item\Status\Iface && $childItem->getParentId() == $id
54 54
 			|| $childItem instanceof \Aimeos\MShop\Order\Item\Base\Iface && $childItem->getId() == $baseId
55 55
 		) {
56 56
 			$type = $childItem->getResourceType();
57
-			$params = array( 'resource' => $childItem->getResourceType(), 'id' => $childId );
57
+			$params = array('resource' => $childItem->getResourceType(), 'id' => $childId);
58 58
 
59
-			$result['relationships'][$type][] = array( 'data' => array(
59
+			$result['relationships'][$type][] = array('data' => array(
60 60
 				'id' => $childId, 'type' => $type,
61 61
 				'links' => array(
62
-					'self' => $this->url( $target, $cntl, $action, $params, [], $config )
62
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
63 63
 				)
64
-			) );
64
+			));
65 65
 		}
66 66
 	}
67 67
 
@@ -69,20 +69,20 @@  discard block
 block discarded – undo
69 69
 };
70 70
 
71 71
 
72
-$data = $this->get( 'data', [] );
73
-$childItems = $this->get( 'childItems', [] );
72
+$data = $this->get('data', []);
73
+$childItems = $this->get('childItems', []);
74 74
 
75
-if( is_array( $data ) )
75
+if (is_array($data))
76 76
 {
77 77
 	$response = [];
78 78
 
79
-	foreach( $data as $item ) {
80
-		$response[] = $build( $item, $childItems );
79
+	foreach ($data as $item) {
80
+		$response[] = $build($item, $childItems);
81 81
 	}
82 82
 }
83
-elseif( $data !== null )
83
+elseif ($data !== null)
84 84
 {
85
-	$response = $build( $data, $childItems );
85
+	$response = $build($data, $childItems);
86 86
 }
87 87
 else
88 88
 {
@@ -90,4 +90,4 @@  discard block
 block discarded – undo
90 90
 }
91 91
 
92 92
 
93
-echo json_encode( $response, $options );
94 93
\ No newline at end of file
94
+echo json_encode($response, $options);
95 95
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/order/base/data-standard.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -9,32 +9,32 @@  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( \Aimeos\MShop\Order\Item\Base\Iface $item, array $childItems ) use ( $fields )
24
+$build = function(\Aimeos\MShop\Order\Item\Base\Iface $item, array $childItems) use ($fields)
25 25
 {
26 26
 	$id = $item->getId();
27 27
 	$type = $item->getResourceType();
28
-	$params = array( 'resource' => $type, 'id' => $id );
29
-	$attributes = $item->toArray( true );
28
+	$params = array('resource' => $type, 'id' => $id);
29
+	$attributes = $item->toArray(true);
30 30
 
31
-	$target = $this->config( 'admin/jsonadm/url/target' );
32
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
33
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
34
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
31
+	$target = $this->config('admin/jsonadm/url/target');
32
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
33
+	$action = $this->config('admin/jsonadm/url/action', 'get');
34
+	$config = $this->config('admin/jsonadm/url/config', []);
35 35
 
36
-	if( isset( $fields[$type] ) ) {
37
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
36
+	if (isset($fields[$type])) {
37
+		$attributes = array_intersect_key($attributes, $fields[$type]);
38 38
 	}
39 39
 
40 40
 	$result = array(
@@ -42,23 +42,23 @@  discard block
 block discarded – undo
42 42
 		'type' => $type,
43 43
 		'attributes' => $attributes,
44 44
 		'links' => array(
45
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
45
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
46 46
 		),
47 47
 		'relationships' => []
48 48
 	);
49 49
 
50
-	foreach( $childItems as $childId => $childItem )
50
+	foreach ($childItems as $childId => $childItem)
51 51
 	{
52
-		if( $childItem->getBaseId() == $id )
52
+		if ($childItem->getBaseId() == $id)
53 53
 		{
54 54
 			$type = $childItem->getResourceType();
55
-			$params = array( 'resource' => $childItem->getResourceType(), 'id' => $childId );
55
+			$params = array('resource' => $childItem->getResourceType(), 'id' => $childId);
56 56
 
57
-			$result['relationships'][$type][] = array( 'data' => array(
57
+			$result['relationships'][$type][] = array('data' => array(
58 58
 				'id' => $childId, 'type' => $type, 'links' => array(
59
-					'self' => $this->url( $target, $cntl, $action, $params, [], $config )
59
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
60 60
 				)
61
-			) );
61
+			));
62 62
 		}
63 63
 	}
64 64
 
@@ -66,20 +66,20 @@  discard block
 block discarded – undo
66 66
 };
67 67
 
68 68
 
69
-$data = $this->get( 'data', [] );
70
-$childItems = $this->get( 'childItems', [] );
69
+$data = $this->get('data', []);
70
+$childItems = $this->get('childItems', []);
71 71
 
72
-if( is_array( $data ) )
72
+if (is_array($data))
73 73
 {
74 74
 	$response = [];
75 75
 
76
-	foreach( $data as $item ) {
77
-		$response[] = $build( $item, $childItems );
76
+	foreach ($data as $item) {
77
+		$response[] = $build($item, $childItems);
78 78
 	}
79 79
 }
80
-elseif( $data !== null )
80
+elseif ($data !== null)
81 81
 {
82
-	$response = $build( $data, $childItems );
82
+	$response = $build($data, $childItems);
83 83
 }
84 84
 else
85 85
 {
@@ -87,4 +87,4 @@  discard block
 block discarded – undo
87 87
 }
88 88
 
89 89
 
90
-echo json_encode( $response, $options );
91 90
\ No newline at end of file
91
+echo json_encode($response, $options);
92 92
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/catalog/data-standard.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -9,32 +9,32 @@  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( \Aimeos\MShop\Catalog\Item\Iface $item, array $listItems ) use ( $fields )
24
+$build = function(\Aimeos\MShop\Catalog\Item\Iface $item, array $listItems) use ($fields)
25 25
 {
26 26
 	$id = $item->getId();
27 27
 	$type = $item->getResourceType();
28
-	$params = array( 'resource' => $type, 'id' => $id );
29
-	$attributes = $item->toArray( true );
28
+	$params = array('resource' => $type, 'id' => $id);
29
+	$attributes = $item->toArray(true);
30 30
 
31
-	$target = $this->config( 'admin/jsonadm/url/target' );
32
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
33
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
34
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
31
+	$target = $this->config('admin/jsonadm/url/target');
32
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
33
+	$action = $this->config('admin/jsonadm/url/action', 'get');
34
+	$config = $this->config('admin/jsonadm/url/config', []);
35 35
 
36
-	if( isset( $fields[$type] ) ) {
37
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
36
+	if (isset($fields[$type])) {
37
+		$attributes = array_intersect_key($attributes, $fields[$type]);
38 38
 	}
39 39
 
40 40
 	$result = array(
@@ -42,32 +42,32 @@  discard block
 block discarded – undo
42 42
 		'type' => $type,
43 43
 		'attributes' => $attributes,
44 44
 		'links' => array(
45
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
45
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
46 46
 		),
47 47
 		'relationships' => []
48 48
 	);
49 49
 
50
-	foreach( $item->getChildren() as $childItem )
50
+	foreach ($item->getChildren() as $childItem)
51 51
 	{
52 52
 		$type = $childItem->getResourceType();
53
-		$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
53
+		$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
54 54
 	}
55 55
 
56
-	foreach( $listItems as $listId => $listItem )
56
+	foreach ($listItems as $listId => $listItem)
57 57
 	{
58
-		if( $listItem->getParentId() == $id )
58
+		if ($listItem->getParentId() == $id)
59 59
 		{
60 60
 			$type = $listItem->getDomain();
61
-			$params = array( 'resource' => $listItem->getResourceType(), 'id' => $listId );
61
+			$params = array('resource' => $listItem->getResourceType(), 'id' => $listId);
62 62
 
63
-			$result['relationships'][$type][] = array( 'data' => array(
63
+			$result['relationships'][$type][] = array('data' => array(
64 64
 				'id' => $listItem->getRefId(),
65 65
 				'type' => $type,
66
-				'attributes' => $listItem->toArray( true ),
66
+				'attributes' => $listItem->toArray(true),
67 67
 				'links' => array(
68
-					'self' => $this->url( $target, $cntl, $action, $params, [], $config )
68
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
69 69
 				)
70
-			) );
70
+			));
71 71
 		}
72 72
 	}
73 73
 
@@ -75,20 +75,20 @@  discard block
 block discarded – undo
75 75
 };
76 76
 
77 77
 
78
-$data = $this->get( 'data', [] );
79
-$listItems = $this->get( 'listItems', [] );
78
+$data = $this->get('data', []);
79
+$listItems = $this->get('listItems', []);
80 80
 
81
-if( is_array( $data ) )
81
+if (is_array($data))
82 82
 {
83 83
 	$response = [];
84 84
 
85
-	foreach( $data as $item ) {
86
-		$response[] = $build( $item, $listItems );
85
+	foreach ($data as $item) {
86
+		$response[] = $build($item, $listItems);
87 87
 	}
88 88
 }
89
-elseif( $data !== null )
89
+elseif ($data !== null)
90 90
 {
91
-	$response = $build( $data, $listItems );
91
+	$response = $build($data, $listItems);
92 92
 }
93 93
 else
94 94
 {
@@ -96,4 +96,4 @@  discard block
 block discarded – undo
96 96
 }
97 97
 
98 98
 
99
-echo json_encode( $response, $options );
100 99
\ No newline at end of file
100
+echo json_encode($response, $options);
101 101
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/locale/site/data-standard.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -9,32 +9,32 @@  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( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields )
24
+$build = function(\Aimeos\MShop\Locale\Item\Site\Iface $item) use ($fields)
25 25
 {
26 26
 	$id = $item->getId();
27 27
 	$type = $item->getResourceType();
28
-	$params = array( 'resource' => $type, 'id' => $id );
29
-	$attributes = $item->toArray( true );
28
+	$params = array('resource' => $type, 'id' => $id);
29
+	$attributes = $item->toArray(true);
30 30
 
31
-	$target = $this->config( 'admin/jsonadm/url/target' );
32
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
33
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
34
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
31
+	$target = $this->config('admin/jsonadm/url/target');
32
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
33
+	$action = $this->config('admin/jsonadm/url/action', 'get');
34
+	$config = $this->config('admin/jsonadm/url/config', []);
35 35
 
36
-	if( isset( $fields[$type] ) ) {
37
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
36
+	if (isset($fields[$type])) {
37
+		$attributes = array_intersect_key($attributes, $fields[$type]);
38 38
 	}
39 39
 
40 40
 	$result = array(
@@ -42,34 +42,34 @@  discard block
 block discarded – undo
42 42
 		'type' => $type,
43 43
 		'attributes' => $attributes,
44 44
 		'links' => array(
45
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
45
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
46 46
 		),
47 47
 		'relationships' => []
48 48
 	);
49 49
 
50
-	foreach( $item->getChildren() as $childItem )
50
+	foreach ($item->getChildren() as $childItem)
51 51
 	{
52 52
 		$type = $childItem->getResourceType();
53
-		$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
53
+		$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
54 54
 	}
55 55
 
56 56
 	return $result;
57 57
 };
58 58
 
59 59
 
60
-$data = $this->get( 'data', [] );
60
+$data = $this->get('data', []);
61 61
 
62
-if( is_array( $data ) )
62
+if (is_array($data))
63 63
 {
64 64
 	$response = [];
65 65
 
66
-	foreach( $data as $item ) {
67
-		$response[] = $build( $item );
66
+	foreach ($data as $item) {
67
+		$response[] = $build($item);
68 68
 	}
69 69
 }
70
-elseif( $data !== null )
70
+elseif ($data !== null)
71 71
 {
72
-	$response = $build( $data );
72
+	$response = $build($data);
73 73
 }
74 74
 else
75 75
 {
@@ -77,4 +77,4 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 
80
-echo json_encode( $response, $options );
81 80
\ No newline at end of file
81
+echo json_encode($response, $options);
82 82
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/data-standard.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -9,32 +9,32 @@  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( \Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems ) use ( $fields )
24
+$build = function(\Aimeos\MShop\Common\Item\Iface $item, array $childItems, array $listItems) use ($fields)
25 25
 {
26
-	$id = strtoupper( $item->getId() );
26
+	$id = strtoupper($item->getId());
27 27
 	$type = $item->getResourceType();
28
-	$params = array( 'resource' => $type, 'id' => $id );
29
-	$attributes = $item->toArray( true );
28
+	$params = array('resource' => $type, 'id' => $id);
29
+	$attributes = $item->toArray(true);
30 30
 
31
-	$target = $this->config( 'admin/jsonadm/url/target' );
32
-	$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
33
-	$action = $this->config( 'admin/jsonadm/url/action', 'get' );
34
-	$config = $this->config( 'admin/jsonadm/url/config', [] );
31
+	$target = $this->config('admin/jsonadm/url/target');
32
+	$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
33
+	$action = $this->config('admin/jsonadm/url/action', 'get');
34
+	$config = $this->config('admin/jsonadm/url/config', []);
35 35
 
36
-	if( isset( $fields[$type] ) ) {
37
-		$attributes = array_intersect_key( $attributes, $fields[$type] );
36
+	if (isset($fields[$type])) {
37
+		$attributes = array_intersect_key($attributes, $fields[$type]);
38 38
 	}
39 39
 
40 40
 	$result = array(
@@ -42,35 +42,35 @@  discard block
 block discarded – undo
42 42
 		'type' => $type,
43 43
 		'attributes' => $attributes,
44 44
 		'links' => array(
45
-			'self' => $this->url( $target, $cntl, $action, $params, [], $config )
45
+			'self' => $this->url($target, $cntl, $action, $params, [], $config)
46 46
 		),
47 47
 		'relationships' => []
48 48
 	);
49 49
 
50
-	foreach( $childItems as $childItem )
50
+	foreach ($childItems as $childItem)
51 51
 	{
52
-		if( $childItem->getParentId() == $id )
52
+		if ($childItem->getParentId() == $id)
53 53
 		{
54 54
 			$type = $childItem->getResourceType();
55
-			$result['relationships'][$type][] = array( 'data' => array( 'id' => $childItem->getId(), 'type' => $type ) );
55
+			$result['relationships'][$type][] = array('data' => array('id' => $childItem->getId(), 'type' => $type));
56 56
 		}
57 57
 	}
58 58
 
59
-	foreach( $listItems as $listId => $listItem )
59
+	foreach ($listItems as $listId => $listItem)
60 60
 	{
61
-		if( $listItem->getParentId() == $id )
61
+		if ($listItem->getParentId() == $id)
62 62
 		{
63 63
 			$type = $listItem->getDomain();
64
-			$params = array( 'resource' => $listItem->getResourceType(), 'id' => $listId );
64
+			$params = array('resource' => $listItem->getResourceType(), 'id' => $listId);
65 65
 
66
-			$result['relationships'][$type][] = array( 'data' => array(
66
+			$result['relationships'][$type][] = array('data' => array(
67 67
 				'id' => $listItem->getRefId(),
68 68
 				'type' => $type,
69
-				'attributes' => $listItem->toArray( true ),
69
+				'attributes' => $listItem->toArray(true),
70 70
 				'links' => array(
71
-					'self' => $this->url( $target, $cntl, $action, $params, [], $config )
71
+					'self' => $this->url($target, $cntl, $action, $params, [], $config)
72 72
 				)
73
-			) );
73
+			));
74 74
 		}
75 75
 	}
76 76
 
@@ -78,21 +78,21 @@  discard block
 block discarded – undo
78 78
 };
79 79
 
80 80
 
81
-$data = $this->get( 'data', [] );
82
-$childItems = $this->get( 'childItems', [] );
83
-$listItems = $this->get( 'listItems', [] );
81
+$data = $this->get('data', []);
82
+$childItems = $this->get('childItems', []);
83
+$listItems = $this->get('listItems', []);
84 84
 
85
-if( is_array( $data ) )
85
+if (is_array($data))
86 86
 {
87 87
 	$response = [];
88 88
 
89
-	foreach( $data as $item ) {
90
-		$response[] = $build( $item, $childItems, $listItems );
89
+	foreach ($data as $item) {
90
+		$response[] = $build($item, $childItems, $listItems);
91 91
 	}
92 92
 }
93
-elseif( $data !== null )
93
+elseif ($data !== null)
94 94
 {
95
-	$response = $build( $data, $childItems, $listItems );
95
+	$response = $build($data, $childItems, $listItems);
96 96
 }
97 97
 else
98 98
 {
@@ -100,4 +100,4 @@  discard block
 block discarded – undo
100 100
 }
101 101
 
102 102
 
103
-echo json_encode( $response, $options );
104 103
\ No newline at end of file
104
+echo json_encode($response, $options);
105 105
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Iface.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
30 30
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
31 31
 	 */
32
-	public function delete( ServerRequestInterface $request, ResponseInterface $response );
32
+	public function delete(ServerRequestInterface $request, ResponseInterface $response);
33 33
 
34 34
 
35 35
 	/**
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
40 40
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
41 41
 	 */
42
-	public function get( ServerRequestInterface $request, ResponseInterface $response );
42
+	public function get(ServerRequestInterface $request, ResponseInterface $response);
43 43
 
44 44
 
45 45
 	/**
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
50 50
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
51 51
 	 */
52
-	public function patch( ServerRequestInterface $request, ResponseInterface $response );
52
+	public function patch(ServerRequestInterface $request, ResponseInterface $response);
53 53
 
54 54
 
55 55
 	/**
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
60 60
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
61 61
 	 */
62
-	public function post( ServerRequestInterface $request, ResponseInterface $response );
62
+	public function post(ServerRequestInterface $request, ResponseInterface $response);
63 63
 
64 64
 
65 65
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
70 70
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
71 71
 	 */
72
-	public function put( ServerRequestInterface $request, ResponseInterface $response );
72
+	public function put(ServerRequestInterface $request, ResponseInterface $response);
73 73
 
74 74
 
75 75
 	/**
@@ -80,5 +80,5 @@  discard block
 block discarded – undo
80 80
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
81 81
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
82 82
 	 */
83
-	public function options( ServerRequestInterface $request, ResponseInterface $response );
83
+	public function options(ServerRequestInterface $request, ResponseInterface $response);
84 84
 }
Please login to merge, or discard this patch.