Completed
Push — master ( 911ad3...49a04a )
by Aimeos
01:52
created
admin/jsonadm/src/Admin/JsonAdm/Common/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,5 +26,5 @@
 block discarded – undo
26 26
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
27 27
 	 * @param string $path Name of the client separated by slashes, e.g "order/base"
28 28
 	 */
29
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path );
29
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path);
30 30
 }
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.
admin/jsonadm/tests/Admin/JsonAdm/Media/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\Media\Standard( $this->context, 'media' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Media\Standard($this->context, 'media');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,25 +31,25 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'media.label' => 'prod_179x178/196_prod_179x178.jpg' )
34
+				'==' => array('media.label' => 'prod_179x178/196_prod_179x178.jpg')
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
-		$this->assertEquals( 200, $response->getStatusCode() );
45
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
44
+		$this->assertEquals(200, $response->getStatusCode());
45
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
46 46
 
47
-		$this->assertEquals( 1, $result['meta']['total'] );
48
-		$this->assertEquals( 1, count( $result['data'] ) );
49
-		$this->assertEquals( 'media', $result['data'][0]['type'] );
50
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['attribute'] ) );
51
-		$this->assertEquals( 1, count( $result['included'] ) );
47
+		$this->assertEquals(1, $result['meta']['total']);
48
+		$this->assertEquals(1, count($result['data']));
49
+		$this->assertEquals('media', $result['data'][0]['type']);
50
+		$this->assertEquals(1, count($result['data'][0]['relationships']['attribute']));
51
+		$this->assertEquals(1, count($result['included']));
52 52
 
53
-		$this->assertArrayNotHasKey( 'errors', $result );
53
+		$this->assertArrayNotHasKey('errors', $result);
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Supplier/StandardTest.php 1 patch
Spacing   +31 added lines, -31 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\Supplier\Standard( $this->context, 'supplier' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Supplier\Standard($this->context, 'supplier');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,28 +31,28 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'supplier.code' => 'unitCode001' )
34
+				'==' => array('supplier.code' => 'unitCode001')
35 35
 			),
36 36
 			'include' => 'text,supplier/address'
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->assertEquals( 1, $result['meta']['total'] );
49
-		$this->assertEquals( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
51
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['text'] ) );
52
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
53
-		$this->assertEquals( 4, count( $result['included'] ) );
48
+		$this->assertEquals(1, $result['meta']['total']);
49
+		$this->assertEquals(1, count($result['data']));
50
+		$this->assertEquals('supplier', $result['data'][0]['type']);
51
+		$this->assertEquals(3, count($result['data'][0]['relationships']['text']));
52
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
53
+		$this->assertEquals(4, count($result['included']));
54 54
 
55
-		$this->assertArrayNotHasKey( 'errors', $result );
55
+		$this->assertArrayNotHasKey('errors', $result);
56 56
 	}
57 57
 
58 58
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	{
61 61
 		$params = array(
62 62
 			'filter' => array(
63
-				'=~' => array( 'supplier.code' => 'unitCode00' )
63
+				'=~' => array('supplier.code' => 'unitCode00')
64 64
 			),
65 65
 			'fields' => array(
66 66
 				'supplier' => 'supplier.id,supplier.label'
@@ -68,23 +68,23 @@  discard block
 block discarded – undo
68 68
 			'sort' => 'supplier.id',
69 69
 			'include' => 'supplier/address'
70 70
 		);
71
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
72
-		$this->view->addHelper( 'param', $helper );
71
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
72
+		$this->view->addHelper('param', $helper);
73 73
 
74
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
75
-		$result = json_decode( (string) $response->getBody(), true );
74
+		$response = $this->object->get($this->view->request(), $this->view->response());
75
+		$result = json_decode((string) $response->getBody(), true);
76 76
 
77 77
 
78
-		$this->assertEquals( 200, $response->getStatusCode() );
79
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
78
+		$this->assertEquals(200, $response->getStatusCode());
79
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
80 80
 
81
-		$this->assertEquals( 3, $result['meta']['total'] );
82
-		$this->assertEquals( 3, count( $result['data'] ) );
83
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
84
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
85
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
86
-		$this->assertEquals( 3, count( $result['included'] ) );
81
+		$this->assertEquals(3, $result['meta']['total']);
82
+		$this->assertEquals(3, count($result['data']));
83
+		$this->assertEquals('supplier', $result['data'][0]['type']);
84
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
85
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
86
+		$this->assertEquals(3, count($result['included']));
87 87
 
88
-		$this->assertArrayNotHasKey( 'errors', $result );
88
+		$this->assertArrayNotHasKey('errors', $result);
89 89
 	}
90 90
 }
91 91
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Coupon/StandardTest.php 1 patch
Spacing   +29 added lines, -29 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\Coupon\Standard( $this->context, 'coupon' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Coupon\Standard($this->context, 'coupon');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,27 +31,27 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'coupon.code.code' => '90AB' )
34
+				'==' => array('coupon.code.code' => '90AB')
35 35
 			),
36 36
 			'include' => 'coupon/code'
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->assertEquals( 1, $result['meta']['total'] );
49
-		$this->assertEquals( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
51
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
52
-		$this->assertEquals( 1, count( $result['included'] ) );
48
+		$this->assertEquals(1, $result['meta']['total']);
49
+		$this->assertEquals(1, count($result['data']));
50
+		$this->assertEquals('coupon', $result['data'][0]['type']);
51
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
52
+		$this->assertEquals(1, count($result['included']));
53 53
 
54
-		$this->assertArrayNotHasKey( 'errors', $result );
54
+		$this->assertArrayNotHasKey('errors', $result);
55 55
 	}
56 56
 
57 57
 
@@ -64,22 +64,22 @@  discard block
 block discarded – undo
64 64
 			'sort' => 'coupon.id',
65 65
 			'include' => 'coupon/code'
66 66
 		);
67
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
68
-		$this->view->addHelper( 'param', $helper );
67
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
68
+		$this->view->addHelper('param', $helper);
69 69
 
70
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
71
-		$result = json_decode( (string) $response->getBody(), true );
70
+		$response = $this->object->get($this->view->request(), $this->view->response());
71
+		$result = json_decode((string) $response->getBody(), true);
72 72
 
73 73
 
74
-		$this->assertEquals( 200, $response->getStatusCode() );
75
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
74
+		$this->assertEquals(200, $response->getStatusCode());
75
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
76 76
 
77
-		$this->assertEquals( 6, $result['meta']['total'] );
78
-		$this->assertEquals( 6, count( $result['data'] ) );
79
-		$this->assertEquals( 'coupon', $result['data'][0]['type'] );
80
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
81
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['coupon/code'] ) );
82
-		$this->assertEquals( 6, count( $result['included'] ) );
83
-		$this->assertArrayNotHasKey( 'errors', $result );
77
+		$this->assertEquals(6, $result['meta']['total']);
78
+		$this->assertEquals(6, count($result['data']));
79
+		$this->assertEquals('coupon', $result['data'][0]['type']);
80
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
81
+		$this->assertEquals(1, count($result['data'][0]['relationships']['coupon/code']));
82
+		$this->assertEquals(6, count($result['included']));
83
+		$this->assertArrayNotHasKey('errors', $result);
84 84
 	}
85 85
 }
86 86
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/templates/patch-standard.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' ), array( 'errors' => $this->errors ) ); ?>
27
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), 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' ), array( 'data' => $this->get( 'data' ) ) ); ?>
31
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard'), 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-standard.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' ), array( 'errors' => $this->errors ) ); ?>
195
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), 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' ), 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'), 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' ), 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'), 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/config-standard.php 1 patch
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' ), array( 'errors' => $this->errors ) ); ?>
60
+		, "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), 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.
admin/jsonadm/templates/delete-standard.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' ), array( 'errors' => $this->errors ) ); ?>
27
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?>
28 28
 
29 29
 	<?php endif; ?>
30 30
 
Please login to merge, or discard this patch.