Completed
Push — master ( d898d1...26c14b )
by Aimeos
02:05
created
admin/jsonadm/templates/delete-default.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 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
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
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( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
28 28
 
29 29
 	<?php endif; ?>
30 30
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/post-default.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 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
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
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( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		, "errors": <?= $this->partial($this->config('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": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
31
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
32 32
 
33 33
 	<?php endif; ?>
34 34
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/get-default.php 1 patch
Spacing   +32 added lines, -32 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
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	"meta": {
153 153
 		"total": <?= $total; ?>
154 154
 
155
-		<?php if( $this->csrf()->name() != '' ) : ?>
155
+		<?php if ($this->csrf()->name() != '') : ?>
156 156
 			, "csrf": {
157 157
 				"name": "<?= $this->csrf()->name(); ?>",
158 158
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -163,42 +163,42 @@  discard block
 block discarded – undo
163 163
 
164 164
 	"links": {
165 165
 
166
-		<?php if( is_array( $this->get( 'data' ) ) ) : ?>
166
+		<?php if (is_array($this->get('data'))) : ?>
167 167
 
168
-			<?php if( $first !== null ) : ?>
168
+			<?php if ($first !== null) : ?>
169 169
 
170
-				"first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
170
+				"first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
171 171
 
172 172
 			<?php endif; ?>
173
-			<?php if( $prev !== null ) : ?>
173
+			<?php if ($prev !== null) : ?>
174 174
 
175
-				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
175
+				"prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
176 176
 
177 177
 			<?php endif; ?>
178
-			<?php if( $next !== null ) : ?>
178
+			<?php if ($next !== null) : ?>
179 179
 
180
-				"next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
180
+				"next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
181 181
 
182 182
 			<?php endif; ?>
183
-			<?php if( $last !== null ) : ?>
183
+			<?php if ($last !== null) : ?>
184 184
 
185
-				"last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>",
185
+				"last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>",
186 186
 
187 187
 			<?php endif; ?>
188 188
 		<?php endif; ?>
189 189
 
190
-		"self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>"
190
+		"self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>"
191 191
 	},
192 192
 
193
-	<?php if( isset( $this->errors ) ) : ?>
193
+	<?php if (isset($this->errors)) : ?>
194 194
 
195
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
195
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
196 196
 
197
-	<?php elseif( isset( $this->data ) ) : ?>
197
+	<?php elseif (isset($this->data)) : ?>
198 198
 
199
-		"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', [] ) ) ); ?>,
199
+		"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', []))); ?>,
200 200
 
201
-		"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', [] ) ) ); ?>
201
+		"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', []))); ?>
202 202
 
203 203
 	<?php endif; ?>
204 204
 
Please login to merge, or discard this patch.
admin/jsonadm/templates/aggregate-default.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@  discard block
 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
-		<?php if( $this->csrf()->name() != '' ) : ?>
23
+		<?php if ($this->csrf()->name() != '') : ?>
24 24
 			, "csrf": {
25 25
 				"name": "<?= $this->csrf()->name(); ?>",
26 26
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 
30 30
 	},
31 31
 
32
-	<?php if( isset( $this->errors ) ) : ?>
32
+	<?php if (isset($this->errors)) : ?>
33 33
 
34
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
34
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
35 35
 
36
-	<?php elseif( isset( $this->data ) ) : ?>
36
+	<?php elseif (isset($this->data)) : ?>
37 37
 
38
-		"data": <?= json_encode( $entries ); ?>
38
+		"data": <?= json_encode($entries); ?>
39 39
 
40 40
 	<?php endif; ?>
41 41
 }
Please login to merge, or discard this patch.
admin/jsonadm/templates/patch-default.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 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
-		<?php if( $this->csrf()->name() != '' ) : ?>
16
+		<?php if ($this->csrf()->name() != '') : ?>
17 17
 			, "csrf": {
18 18
 				"name": "<?= $this->csrf()->name(); ?>",
19 19
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
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( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
27
+		, "errors": <?= $this->partial($this->config('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": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ) ) ); ?>
31
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard.php'), array('data' => $this->get('data'))); ?>
32 32
 
33 33
 	<?php endif; ?>
34 34
 
Please login to merge, or discard this patch.