Completed
Push — master ( a37fad...1098fc )
by Aimeos
02:21
created
admin/jsonadm/templates/partials/catalog/data-standard.php 2 patches
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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,12 +85,10 @@
 block discarded – undo
85 85
 	foreach( $data as $item ) {
86 86
 		$response[] = $build( $item, $listItems );
87 87
 	}
88
-}
89
-elseif( $data !== null )
88
+} elseif( $data !== null )
90 89
 {
91 90
 	$response = $build( $data, $listItems );
92
-}
93
-else
91
+} else
94 92
 {
95 93
 	$response = null;
96 94
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/partials/locale/site/data-standard.php 2 patches
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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,12 +66,10 @@
 block discarded – undo
66 66
 	foreach( $data as $item ) {
67 67
 		$response[] = $build( $item );
68 68
 	}
69
-}
70
-elseif( $data !== null )
69
+} elseif( $data !== null )
71 70
 {
72 71
 	$response = $build( $data );
73
-}
74
-else
72
+} else
75 73
 {
76 74
 	$response = null;
77 75
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/aggregate-default.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,27 +8,27 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 
11
-$data = $this->get( 'data', [] );
11
+$data = $this->get('data', []);
12 12
 $entries = [];
13 13
 
14
-foreach( $data as $key => $value ) {
15
-	$entries[] = array( 'id' => $key, 'type' => 'aggregate', 'attributes' => $value );
14
+foreach ($data as $key => $value) {
15
+	$entries[] = array('id' => $key, 'type' => 'aggregate', 'attributes' => $value);
16 16
 }
17 17
 
18 18
 ?>
19 19
 {
20 20
 	"meta": {
21
-		"total": <?= count( $data ); ?>
21
+		"total": <?= count($data); ?>
22 22
 
23 23
 	},
24 24
 
25
-	<?php if( isset( $this->errors ) ) : ?>
25
+	<?php if (isset($this->errors)) : ?>
26 26
 
27
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
28 28
 
29
-	<?php elseif( isset( $this->data ) ) : ?>
29
+	<?php elseif (isset($this->data)) : ?>
30 30
 
31
-		"data": <?= json_encode( $entries ); ?>
31
+		"data": <?= json_encode($entries); ?>
32 32
 
33 33
 	<?php endif; ?>
34 34
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/put-default.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,9 @@
 block discarded – undo
10 10
 
11 11
 ?>
12 12
 {
13
-	<?php if( isset( $this->errors ) ) : ?>
13
+	<?php if (isset($this->errors)) : ?>
14 14
 
15
-		"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
15
+		"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
16 16
 
17 17
 	<?php endif; ?>
18 18
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/post-default.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,17 +11,17 @@
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16 16
 	}
17 17
 
18
-	<?php if( isset( $this->errors ) ) : ?>
18
+	<?php if (isset($this->errors)) : ?>
19 19
 
20
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
20
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
21 21
 
22
-	<?php elseif( isset( $this->data ) ) : ?>
22
+	<?php elseif (isset($this->data)) : ?>
23 23
 
24
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
24
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
25 25
 
26 26
 	<?php endif; ?>
27 27
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/delete-default.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16 16
 	}
17 17
 
18
-	<?php if( isset( $this->errors ) ) : ?>
18
+	<?php if (isset($this->errors)) : ?>
19 19
 
20
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
20
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
21 21
 
22 22
 	<?php endif; ?>
23 23
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/get-default.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  * @see admin/jsonadm/url/action
23 23
  * @see admin/jsonadm/url/config
24 24
  */
25
-$target = $this->config( 'admin/jsonadm/url/target' );
25
+$target = $this->config('admin/jsonadm/url/target');
26 26
 
27 27
 /** admin/jsonadm/url/controller
28 28
  * Name of the client whose action should be called
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
  * @see admin/jsonadm/url/action
39 39
  * @see admin/jsonadm/url/config
40 40
  */
41
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
41
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
42 42
 
43 43
 /** admin/jsonadm/url/action
44 44
  * Name of the action that should create the output
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
  * @see admin/jsonadm/url/controller
55 55
  * @see admin/jsonadm/url/config
56 56
  */
57
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
57
+$action = $this->config('admin/jsonadm/url/action', 'get');
58 58
 
59 59
 /** admin/jsonadm/url/config
60 60
  * Associative list of configuration options used for generating the URL
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
  * @see admin/jsonadm/url/controller
77 77
  * @see admin/jsonadm/url/action
78 78
  */
79
-$config = $this->config( 'admin/jsonadm/url/config', [] );
79
+$config = $this->config('admin/jsonadm/url/config', []);
80 80
 
81 81
 
82 82
 /** admin/jsonadm/partials/template-errors
@@ -128,22 +128,22 @@  discard block
 block discarded – undo
128 128
  */
129 129
 
130 130
 
131
-$total = $this->get( 'total', 0 );
132
-$offset = max( $this->param( 'page/offset', 0 ), 0 );
133
-$limit = max( $this->param( 'page/limit', 25 ), 1 );
131
+$total = $this->get('total', 0);
132
+$offset = max($this->param('page/offset', 0), 0);
133
+$limit = max($this->param('page/limit', 25), 1);
134 134
 
135
-$first = ( $offset > 0 ? 0 : null );
136
-$prev = ( $offset - $limit >= 0 ? $offset - $limit : null );
137
-$next = ( $offset + $limit < $total ? $offset + $limit : null );
138
-$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null );
135
+$first = ($offset > 0 ? 0 : null);
136
+$prev = ($offset - $limit >= 0 ? $offset - $limit : null);
137
+$next = ($offset + $limit < $total ? $offset + $limit : null);
138
+$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null);
139 139
 
140 140
 
141
-$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' );
142
-$params = array_intersect_key( $this->param(), array_flip( $ref ) ) + ['id' => ''];
143
-$fields = $this->param( 'fields', [] );
141
+$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields');
142
+$params = array_intersect_key($this->param(), array_flip($ref)) + ['id' => ''];
143
+$fields = $this->param('fields', []);
144 144
 
145
-foreach( (array) $fields as $resource => $list ) {
146
-	$fields[$resource] = array_flip( explode( ',', $list ) );
145
+foreach ((array) $fields as $resource => $list) {
146
+	$fields[$resource] = array_flip(explode(',', $list));
147 147
 }
148 148
 
149 149
 
@@ -156,42 +156,42 @@  discard block
 block discarded – undo
156 156
 
157 157
 	"links": {
158 158
 
159
-		<?php if( is_array( $this->get( 'data' ) ) ) : ?>
159
+		<?php if (is_array($this->get('data'))) : ?>
160 160
 
161
-			<?php if( $first !== null ) : ?>
161
+			<?php if ($first !== null) : ?>
162 162
 
163
-				"first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
163
+				"first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
164 164
 
165 165
 			<?php endif; ?>
166
-			<?php if( $prev !== null ) : ?>
166
+			<?php if ($prev !== null) : ?>
167 167
 
168
-				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
168
+				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
169 169
 
170 170
 			<?php endif; ?>
171
-			<?php if( $next !== null ) : ?>
171
+			<?php if ($next !== null) : ?>
172 172
 
173
-				"next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
173
+				"next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
174 174
 
175 175
 			<?php endif; ?>
176
-			<?php if( $last !== null ) : ?>
176
+			<?php if ($last !== null) : ?>
177 177
 
178
-				"last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
178
+				"last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
179 179
 
180 180
 			<?php endif; ?>
181 181
 		<?php endif; ?>
182 182
 
183
-		"self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>"
183
+		"self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>"
184 184
 	},
185 185
 
186
-	<?php if( isset( $this->errors ) ) : ?>
186
+	<?php if (isset($this->errors)) : ?>
187 187
 
188
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
188
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
189 189
 
190
-	<?php elseif( isset( $this->data ) ) : ?>
190
+	<?php elseif (isset($this->data)) : ?>
191 191
 
192
-		"data": <?= $this->partial( $this->config( $this->get( 'partial-data', 'admin/jsonadm/partials/template-data' ), 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ), 'childItems' => $this->get( 'childItems', [] ), 'listItems' => $this->get( 'listItems', [] ) ) ); ?>,
192
+		"data": <?= $this->partial($this->config($this->get('partial-data', 'admin/jsonadm/partials/template-data'), 'partials/data-standard.php'), array('data' => $this->get('data'), 'childItems' => $this->get('childItems', []), 'listItems' => $this->get('listItems', []))); ?>,
193 193
 
194
-		"included": <?= $this->partial( $this->config( $this->get( 'partial-included', 'admin/jsonadm/partials/template-included' ), 'partials/included-standard.php' ), array( 'childItems' => $this->get( 'childItems', [] ), 'refItems' => $this->get( 'refItems', [] ) ) ); ?>
194
+		"included": <?= $this->partial($this->config($this->get('partial-included', 'admin/jsonadm/partials/template-included'), 'partials/included-standard.php'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?>
195 195
 
196 196
 	<?php endif; ?>
197 197
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/patch-default.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,17 +11,17 @@
 block discarded – undo
11 11
 ?>
12 12
 {
13 13
 	"meta": {
14
-		"total": <?= $this->get( 'total', 0 ); ?>
14
+		"total": <?= $this->get('total', 0); ?>
15 15
 
16 16
 	}
17 17
 
18
-	<?php if( isset( $this->errors ) ) : ?>
18
+	<?php if (isset($this->errors)) : ?>
19 19
 
20
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
20
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
21 21
 
22
-	<?php elseif( isset( $this->data ) ) : ?>
22
+	<?php elseif (isset($this->data)) : ?>
23 23
 
24
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
24
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
25 25
 
26 26
 	<?php endif; ?>
27 27
 
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/FactoryTest.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 		$context = \TestHelperJadm::getContext();
17 17
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
18 18
 
19
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
20
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
21
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client );
19
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
20
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
21
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client);
22 22
 	}
23 23
 
24 24
 
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 		$context = \TestHelperJadm::getContext();
28 28
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
29 29
 
30
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
31
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
32
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client );
30
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
31
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
32
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client);
33 33
 	}
34 34
 
35 35
 
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 		$context = \TestHelperJadm::getContext();
39 39
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
40 40
 
41
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'stock/type' );
42
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
43
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
41
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'stock/type');
42
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
43
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
44 44
 	}
45 45
 
46 46
 
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 		$context = \TestHelperJadm::getContext();
50 50
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
51 51
 
52
-		$client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '' );
53
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
54
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
52
+		$client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '');
53
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
54
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
55 55
 	}
56 56
 
57 57
 
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 		$context = \TestHelperJadm::getContext();
61 61
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
62 62
 
63
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
64
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '%^' );
63
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
64
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '%^');
65 65
 	}
66 66
 
67 67
 
@@ -70,68 +70,68 @@  discard block
 block discarded – undo
70 70
 		$context = \TestHelperJadm::getContext();
71 71
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
72 72
 
73
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
74
-		\Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '', '%^' );
73
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
74
+		\Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '', '%^');
75 75
 	}
76 76
 
77 77
 
78 78
 	public function testClear()
79 79
 	{
80
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
80
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
81 81
 
82 82
 		$context = \TestHelperJadm::getContext();
83 83
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
84 84
 
85
-		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
85
+		$client1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
86 86
 		\Aimeos\Admin\JsonAdm\Factory::clear();
87
-		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
87
+		$client2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
88 88
 
89
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
89
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
90 90
 
91
-		$this->assertNotSame( $client1, $client2 );
91
+		$this->assertNotSame($client1, $client2);
92 92
 	}
93 93
 
94 94
 
95 95
 	public function testClearSite()
96 96
 	{
97
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
97
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
98 98
 
99 99
 		$context = \TestHelperJadm::getContext();
100 100
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
101 101
 
102
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
103
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
104
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context );
102
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
103
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
104
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context);
105 105
 
106
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
107
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
106
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
107
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
108 108
 
109
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
109
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
110 110
 
111
-		$this->assertNotSame( $cntlA1, $cntlA2 );
112
-		$this->assertNotSame( $cntlB1, $cntlB2 );
111
+		$this->assertNotSame($cntlA1, $cntlA2);
112
+		$this->assertNotSame($cntlB1, $cntlB2);
113 113
 	}
114 114
 
115 115
 
116 116
 	public function testClearSpecific()
117 117
 	{
118
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
118
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
119 119
 
120 120
 		$context = \TestHelperJadm::getContext();
121 121
 		$templatePaths = \TestHelperJadm::getJsonadmPaths();
122 122
 
123
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
124
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
123
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
124
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
125 125
 
126
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context, 'order' );
126
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context, 'order');
127 127
 
128
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' );
129
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' );
128
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order');
129
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base');
130 130
 
131
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
131
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
132 132
 
133
-		$this->assertNotSame( $cntlA1, $cntlA2 );
134
-		$this->assertSame( $cntlB1, $cntlB2 );
133
+		$this->assertNotSame($cntlA1, $cntlA2);
134
+		$this->assertSame($cntlB1, $cntlB2);
135 135
 	}
136 136
 
137 137
 }
138 138
\ No newline at end of file
Please login to merge, or discard this patch.