Completed
Push — master ( 901166...f23a48 )
by Aimeos
02:55
created
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/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/templates/options-default.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,35 +8,35 @@
 block discarded – undo
8 8
  */
9 9
 
10 10
 
11
-$target = $this->config( 'admin/jsonadm/url/target' );
12
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
13
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
14
-$config = $this->config( 'admin/jsonadm/url/config', [] );
11
+$target = $this->config('admin/jsonadm/url/target');
12
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
13
+$action = $this->config('admin/jsonadm/url/action', 'get');
14
+$config = $this->config('admin/jsonadm/url/config', []);
15 15
 
16 16
 
17 17
 $resources = $attributes = [];
18
-$site = $this->param( 'site', 'default' );
18
+$site = $this->param('site', 'default');
19 19
 
20
-foreach( $this->get( 'resources', [] ) as $resource ) {
21
-	$resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config );
20
+foreach ($this->get('resources', []) as $resource) {
21
+	$resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config);
22 22
 }
23 23
 
24
-foreach( $this->get( 'attributes', [] ) as $attr ) {
25
-	$attributes[$attr->getCode()] = $attr->toArray( true );
24
+foreach ($this->get('attributes', []) as $attr) {
25
+	$attributes[$attr->getCode()] = $attr->toArray(true);
26 26
 }
27 27
 
28 28
 
29 29
 ?>
30 30
 {
31 31
 	"meta": {
32
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
33
-		"resources": <?= json_encode( $resources ); ?>,
34
-		"attributes": <?= json_encode( $attributes ); ?>
32
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
33
+		"resources": <?= json_encode($resources); ?>,
34
+		"attributes": <?= json_encode($attributes); ?>
35 35
 	}
36 36
 
37
-	<?php if( isset( $this->errors ) ) : ?>
37
+	<?php if (isset($this->errors)) : ?>
38 38
 
39
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
39
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
40 40
 
41 41
 	<?php endif; ?>
42 42
 
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.